Merge branch 'master' of vps:git/vcsh/sway

This commit is contained in:
David Thurstenson 2020-06-03 19:26:05 -05:00
commit b329401635
3 changed files with 119 additions and 133 deletions

View File

@ -2,137 +2,114 @@
#
# Thurstylark
# Basics:
#
# Start a terminal
bindsym $mod+Return exec $term
# Kill focused window
bindsym $mod+Shift+q kill
# Start your launcher
bindsym $mod+d exec $menu
# Drag floating windows by holding down $mod and left mouse button.
# Resize them with right mouse button + $mod.
# Despite the name, also works for non-floating windows.
floating_modifier $mod normal
# Reload the configuration file
bindsym $mod+Shift+c reload
# Exit sway (logs you out of your Wayland session)
#bindsym $mod+Shift+e exec swaynag -t warning -m 'Exit Sway?' -b 'Exit' 'swaymsg exit'
bindsym $mod+Shift+e exit
## Main ##
#
# Moving around:
# Start a terminal
bindsym $mod+Return exec $term
# Kill focused window
bindsym $mod+Shift+q kill
# Start your launcher
bindsym $mod+d exec $menu
# Drag windows: $mod+mouse1
# Resize windows: $mod+mouse2
# Despite the name, also works for non-floating windows.
floating_modifier $mod normal
# Reload the configuration file
bindsym $mod+Shift+c reload
# Exit sway (logs you out of your Wayland session)
bindsym $mod+Shift+e exit
## Display brightness
# Requires light(1)
bindsym --locked XF86MonBrightnessUp exec --no-startup-id "light -A 2"
bindsym --locked XF86MonBrightnessDown exec --no-startup-id "light -U 2"
## Media Keys
# Volume
bindsym --locked XF86AudioMute exec --no-startup-id \
"pactl set-sink-mute @DEFAULT_SINK@ toggle"
bindsym --locked XF86AudioRaiseVolume exec --no-startup-id \
"pactl set-sink-volume @DEFAULT_SINK@ +5%"
bindsym --locked XF86AudioLowerVolume exec --no-startup-id \
"pactl set-sink-volume @DEFAULT_SINK@ -5%"
# Playhead
bindsym --locked XF86AudioPlay exec \
"playerctl play-pause"
bindsym --locked XF86AudioNext exec \
"playerctl next"
bindsym --locked XF86AudioPrev exec \
"playerctl previous"
#
# Move your focus around
bindsym $mod+$left focus left
bindsym $mod+$down focus down
bindsym $mod+$up focus up
bindsym $mod+$right focus right
# Or use $mod+[up|down|left|right]
bindsym $mod+Left focus left
bindsym $mod+Down focus down
bindsym $mod+Up focus up
bindsym $mod+Right focus right
# Move the focused window with the same, but add Shift
bindsym $mod+Shift+$left move left
bindsym $mod+Shift+$down move down
bindsym $mod+Shift+$up move up
bindsym $mod+Shift+$right move right
# Ditto, with arrow keys
bindsym $mod+Shift+Left move left
bindsym $mod+Shift+Down move down
bindsym $mod+Shift+Up move up
bindsym $mod+Shift+Right move right
## Layout ##
#
# Workspaces:
# See: ./21-layout.conf
# respectively.
bindsym $mod+b splitv
bindsym $mod+v splith
# Switch the current container between different layout styles
bindsym $mod+s layout stacking
bindsym $mod+w layout tabbed
bindsym $mod+e layout toggle split
# Make the current focus fullscreen
bindsym $mod+f fullscreen
# Toggle the current focus between tiling and floating mode
bindsym $mod+Shift+space floating toggle
# Swap focus between the tiling area and the floating area
bindsym $mod+space focus mode_toggle
# Move focus to the parent container
bindsym $mod+a focus parent
#
# Switch to workspace
bindsym $mod+1 workspace 1
bindsym $mod+2 workspace 2
bindsym $mod+3 workspace 3
bindsym $mod+4 workspace 4
bindsym $mod+5 workspace 5
bindsym $mod+6 workspace 6
bindsym $mod+7 workspace 7
bindsym $mod+8 workspace 8
bindsym $mod+9 workspace 9
bindsym $mod+0 workspace 10
# Move focused container to workspace
bindsym $mod+Shift+1 move container to workspace 1
bindsym $mod+Shift+2 move container to workspace 2
bindsym $mod+Shift+3 move container to workspace 3
bindsym $mod+Shift+4 move container to workspace 4
bindsym $mod+Shift+5 move container to workspace 5
bindsym $mod+Shift+6 move container to workspace 6
bindsym $mod+Shift+7 move container to workspace 7
bindsym $mod+Shift+8 move container to workspace 8
bindsym $mod+Shift+9 move container to workspace 9
bindsym $mod+Shift+0 move container to workspace 10
# Note: workspaces can have any name you want, not just numbers.
# We just use 1-10 as the default.
## Movement ##
#
# Layout stuff:
# See: ./22-movement.conf
#
# You can "split" the current object of your focus with
# $mod+b or $mod+v, for horizontal and vertical splits
# respectively.
bindsym $mod+b splith
bindsym $mod+v splitv
# Switch the current container between different layout styles
bindsym $mod+s layout stacking
bindsym $mod+w layout tabbed
bindsym $mod+e layout toggle split
# Make the current focus fullscreen
bindsym $mod+f fullscreen
# Toggle the current focus between tiling and floating mode
bindsym $mod+Shift+space floating toggle
# Swap focus between the tiling area and the floating area
bindsym $mod+space focus mode_toggle
# Move focus to the parent container
bindsym $mod+a focus parent
## Resize Mode ##
#
# Scratchpad:
#
# Sway has a "scratchpad", which is a bag of holding for windows.
# You can send windows there and get them back later.
# See: ./23-resizemode.inc
# Move the currently focused window to the scratchpad
bindsym $mod+Shift+minus move scratchpad
# Because the mode needs to be configured before the keybinding:
include ./23-resizemode.inc
# Show the next scratchpad window or hide the focused scratchpad window.
# If there are multiple scratchpad windows, this command cycles through them.
bindsym $mod+minus scratchpad show
#
# Resizing containers:
#
mode "resize" {
# left will shrink the containers width
# right will grow the containers width
# up will shrink the containers height
# down will grow the containers height
bindsym $left resize shrink width 10px
bindsym $down resize grow height 10px
bindsym $up resize shrink height 10px
bindsym $right resize grow width 10px
# Ditto, with arrow keys
bindsym Left resize shrink width 10px
bindsym Down resize grow height 10px
bindsym Up resize shrink height 10px
bindsym Right resize grow width 10px
# Return to default mode
bindsym Return mode "default"
bindsym Escape mode "default"
}
# Enter resize mode
bindsym $mod+r mode "resize"
#
## Workspaces ##
#
# See: ./24-workspaces.conf
#
## Scratchpad ##
#
# Move the currently focused window to the scratchpad
bindsym $mod+Shift+minus move scratchpad
# Show the next scratchpad window or hide the focused scratchpad window.
# If there are multiple scratchpad windows, this command cycles through them.
bindsym $mod+minus scratchpad show

View File

@ -2,22 +2,27 @@
#
# Thurstylark
set $ws-media Media
# Switch output to workspace
bindsym $mod+Home workspace media
bindsym $mod+Home workspace $ws-media
# Move focused container to workspace
bindsym $mod+Shift+Home move container to workspace media
bindsym $mod+Shift+Home move container to workspace $ws-media
assign [app_id="mpv"] workspace media
for_window [app_id="mpv"] fullscreen enable
# Any mpv window should show on media workspace
for_window [app_id="mpv"] {
move container to workspace $ws-media
fullscreen enable
}
for_window [app_id="mctrl"] {
resize set width 1700 px height 1400 px
move position center
move down 3000 px
move window to scratchpad
floating enable
resize set width 700 px height 200 px
move position center
move down 300 px
move window to scratchpad
}
# Launch mpv using the contents of the clipboard
bindsym $mod+Insert exec alacritty --class mctrl -e mpv $$(wl-paste)
bindsym $mod+Insert exec "alacritty --class mctrl -e mpv $$(wl-paste)"

View File

@ -8,8 +8,12 @@ set $omimon "Dell Inc. Dell AW3420DW 20X9D9990E2L"
# Sane default of 1080p60
output * mode 1920x1080@60Hz
<<<<<<< HEAD
output DP-1 mode 3440x1440@59Hz
output $omimon mode 3440x1440@60Hz
output * bg ~/.config/sway/lark-desktop/bg center #000000
=======
output * bg ~/.config/sway/$hostname/bg center #000000
>>>>>>> efbd9091616831d94e7a13aac756823de0baf49c