From 636b6d696ad0e87e09964ea49923b274be2f54d1 Mon Sep 17 00:00:00 2001 From: David Thurstenson Date: Wed, 7 Jul 2021 18:25:56 -0500 Subject: [PATCH] Updating structure for shared configs --- .config/sway/available/20-keybindings.conf | 126 ------------------ .config/sway/available/bar/py3status.conf | 15 +++ .../media-workspace.conf} | 0 .../monitor-workspace.conf} | 0 .../available/extras/terminal-workspace.conf | 9 ++ .../{21-layout.conf => general/base.conf} | 7 +- .../idle-lock.conf} | 0 .../variables.conf} | 0 .../cursor-hide.conf} | 0 .../{41-input.conf => input/input.conf} | 0 .../available/keybinds/backlight-keys.conf | 8 ++ .config/sway/available/keybinds/base.conf | 23 ++++ .../{22-movement.conf => keybinds/focus.conf} | 0 .config/sway/available/keybinds/movement.conf | 24 ++++ .config/sway/available/keybinds/passmenu.conf | 5 + .../keybinds/playerctl-media-keys.conf | 13 ++ .../available/keybinds/pulse-media-keys.conf | 13 ++ .../sway/available/keybinds/scratchpad.conf | 10 ++ .../sway/available/keybinds/screen-lock.conf | 5 + .config/sway/available/keybinds/suspend.conf | 5 + .../workspaces.conf} | 2 - .../{23-resizemode.inc => mode/resize.conf} | 2 + .../backlight-min.conf} | 0 .../configure.conf} | 0 .../default-bg.conf} | 0 .../random-bg.conf} | 0 .../sane-default.conf} | 0 27 files changed, 137 insertions(+), 130 deletions(-) delete mode 100644 .config/sway/available/20-keybindings.conf create mode 100644 .config/sway/available/bar/py3status.conf rename .config/sway/available/{99-media-workspace.conf => extras/media-workspace.conf} (100%) rename .config/sway/available/{99-bpytop-monitor.conf => extras/monitor-workspace.conf} (100%) create mode 100644 .config/sway/available/extras/terminal-workspace.conf rename .config/sway/available/{21-layout.conf => general/base.conf} (70%) rename .config/sway/available/{60-idle-lock.conf => general/idle-lock.conf} (100%) rename .config/sway/available/{10-variables.conf => general/variables.conf} (100%) rename .config/sway/available/{42-cursor-hide.conf => input/cursor-hide.conf} (100%) rename .config/sway/available/{41-input.conf => input/input.conf} (100%) create mode 100644 .config/sway/available/keybinds/backlight-keys.conf create mode 100644 .config/sway/available/keybinds/base.conf rename .config/sway/available/{22-movement.conf => keybinds/focus.conf} (100%) create mode 100644 .config/sway/available/keybinds/movement.conf create mode 100644 .config/sway/available/keybinds/passmenu.conf create mode 100644 .config/sway/available/keybinds/playerctl-media-keys.conf create mode 100644 .config/sway/available/keybinds/pulse-media-keys.conf create mode 100644 .config/sway/available/keybinds/scratchpad.conf create mode 100644 .config/sway/available/keybinds/screen-lock.conf create mode 100644 .config/sway/available/keybinds/suspend.conf rename .config/sway/available/{24-workspaces.conf => keybinds/workspaces.conf} (90%) rename .config/sway/available/{23-resizemode.inc => mode/resize.conf} (95%) rename .config/sway/available/{34-output-backlight-configure.conf => output/backlight-min.conf} (100%) rename .config/sway/available/{31-output-configure.conf => output/configure.conf} (100%) rename .config/sway/available/{32-output-default-bg-configure.conf => output/default-bg.conf} (100%) rename .config/sway/available/{33-output-random-bg-configure.conf => output/random-bg.conf} (100%) rename .config/sway/available/{30-output-sane-default.conf => output/sane-default.conf} (100%) diff --git a/.config/sway/available/20-keybindings.conf b/.config/sway/available/20-keybindings.conf deleted file mode 100644 index 1005ab2..0000000 --- a/.config/sway/available/20-keybindings.conf +++ /dev/null @@ -1,126 +0,0 @@ -# Sway config: Key bindings -# -# Thurstylark - - -# -## Main ## -# - -# 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 - -# Lock Screen -# See 11-idle_lock.conf for locker definition -bindsym $mod+Mod1+l exec "$locker" - -# Suspend the whole system -bindsym $mod+Mod1+s exec "systemctl suspend" - -# Passmenu -# (using aur/bemenu-dmenu to use dmenu without patching passmenu) -bindsym $mod+p exec passmenu - - -## 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" - - -# -## Layout ## -# -# 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 - - -# -## Movement ## -# -# See: ./22-movement.conf - - -# -## Resize Mode ## -# -# See: ./23-resizemode.inc - -# Because the mode needs to be configured before the keybinding: -include ./23-resizemode.inc - -# 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 - diff --git a/.config/sway/available/bar/py3status.conf b/.config/sway/available/bar/py3status.conf new file mode 100644 index 0000000..e365029 --- /dev/null +++ b/.config/sway/available/bar/py3status.conf @@ -0,0 +1,15 @@ +# Sway Config: Bar +# +# Thurstylark + +bar { + position bottom + + status_command py3status -c $dir-localconf/bar/py3status.py + + colors { + statusline #ffffff + background #323232 + inactive_workspace #32323200 #32323200 #5c5c5c + } +} diff --git a/.config/sway/available/99-media-workspace.conf b/.config/sway/available/extras/media-workspace.conf similarity index 100% rename from .config/sway/available/99-media-workspace.conf rename to .config/sway/available/extras/media-workspace.conf diff --git a/.config/sway/available/99-bpytop-monitor.conf b/.config/sway/available/extras/monitor-workspace.conf similarity index 100% rename from .config/sway/available/99-bpytop-monitor.conf rename to .config/sway/available/extras/monitor-workspace.conf diff --git a/.config/sway/available/extras/terminal-workspace.conf b/.config/sway/available/extras/terminal-workspace.conf new file mode 100644 index 0000000..2147c8a --- /dev/null +++ b/.config/sway/available/extras/terminal-workspace.conf @@ -0,0 +1,9 @@ +# Sway Config: Terminals Workspace +# +# Thurstylark + +# Switch to workspace +bindsym $mod+grave workspace Terminals + +# Move focussed container to workspace +bindsym $mod+Shift+grave move container to workspace Terminals diff --git a/.config/sway/available/21-layout.conf b/.config/sway/available/general/base.conf similarity index 70% rename from .config/sway/available/21-layout.conf rename to .config/sway/available/general/base.conf index 4b70729..d09a4b6 100644 --- a/.config/sway/available/21-layout.conf +++ b/.config/sway/available/general/base.conf @@ -1,4 +1,4 @@ -# Sway Config: Layout +# Sway Config: Base Behavior # # Thurstylark @@ -18,4 +18,7 @@ smart_borders on # Make window "sticky" to the output regardless of workspace bindsym $mod+Shift+s sticky toggle -# Layout-related keybindings can be found in ./20-keybindings.conf +# Drag windows: $mod+mouse1 +# Resize windows: $mod+mouse2 +# Despite the name, also works for non-floating windows. +floating_modifier $mod normal diff --git a/.config/sway/available/60-idle-lock.conf b/.config/sway/available/general/idle-lock.conf similarity index 100% rename from .config/sway/available/60-idle-lock.conf rename to .config/sway/available/general/idle-lock.conf diff --git a/.config/sway/available/10-variables.conf b/.config/sway/available/general/variables.conf similarity index 100% rename from .config/sway/available/10-variables.conf rename to .config/sway/available/general/variables.conf diff --git a/.config/sway/available/42-cursor-hide.conf b/.config/sway/available/input/cursor-hide.conf similarity index 100% rename from .config/sway/available/42-cursor-hide.conf rename to .config/sway/available/input/cursor-hide.conf diff --git a/.config/sway/available/41-input.conf b/.config/sway/available/input/input.conf similarity index 100% rename from .config/sway/available/41-input.conf rename to .config/sway/available/input/input.conf diff --git a/.config/sway/available/keybinds/backlight-keys.conf b/.config/sway/available/keybinds/backlight-keys.conf new file mode 100644 index 0000000..eb3f377 --- /dev/null +++ b/.config/sway/available/keybinds/backlight-keys.conf @@ -0,0 +1,8 @@ +# Sway Config: Display Brightness Keybinds +# +# Thurstylark +# +# Requires: Light + +bindsym --locked XF86MonBrightnessUp exec --no-startup-id "light -A 2" +bindsym --locked XF86MonBrightnessDown exec --no-startup-id "light -U 2" diff --git a/.config/sway/available/keybinds/base.conf b/.config/sway/available/keybinds/base.conf new file mode 100644 index 0000000..24a19a0 --- /dev/null +++ b/.config/sway/available/keybinds/base.conf @@ -0,0 +1,23 @@ +# Sway Config: Base Key bindings +# +# Thurstylark + + +# Start a terminal +bindsym $mod+Return exec $term + + +# Kill focused window +bindsym $mod+Shift+q kill + + +# Start launcher +bindsym $mod+d exec $menu + + +# Reload the configuration file +bindsym $mod+Shift+c reload + + +# Exit sway +bindsym $mod+Shift+e exit diff --git a/.config/sway/available/22-movement.conf b/.config/sway/available/keybinds/focus.conf similarity index 100% rename from .config/sway/available/22-movement.conf rename to .config/sway/available/keybinds/focus.conf diff --git a/.config/sway/available/keybinds/movement.conf b/.config/sway/available/keybinds/movement.conf new file mode 100644 index 0000000..1ed1288 --- /dev/null +++ b/.config/sway/available/keybinds/movement.conf @@ -0,0 +1,24 @@ +# Sway Config: Movement Key bindings +# +# Thurstylark + +# Split the current container +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 diff --git a/.config/sway/available/keybinds/passmenu.conf b/.config/sway/available/keybinds/passmenu.conf new file mode 100644 index 0000000..4d6a96b --- /dev/null +++ b/.config/sway/available/keybinds/passmenu.conf @@ -0,0 +1,5 @@ +# Sway Config: Passmenu +# +# Thurstylark + +bindsym $mod+p exec passmenu diff --git a/.config/sway/available/keybinds/playerctl-media-keys.conf b/.config/sway/available/keybinds/playerctl-media-keys.conf new file mode 100644 index 0000000..4d4565e --- /dev/null +++ b/.config/sway/available/keybinds/playerctl-media-keys.conf @@ -0,0 +1,13 @@ +# Sway Config: Playerctl Media Keys +# +# Thurstylark +# +# Requires: Playerctl + +# Playhead +bindsym --locked XF86AudioPlay exec \ + "playerctl play-pause" +bindsym --locked XF86AudioNext exec \ + "playerctl next" +bindsym --locked XF86AudioPrev exec \ + "playerctl previous" diff --git a/.config/sway/available/keybinds/pulse-media-keys.conf b/.config/sway/available/keybinds/pulse-media-keys.conf new file mode 100644 index 0000000..c636055 --- /dev/null +++ b/.config/sway/available/keybinds/pulse-media-keys.conf @@ -0,0 +1,13 @@ +# Sway Config: PulseAudio Media Keys +# +# Thurstylark +# +# Requires: pulseaudio and pactl + +# 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%" diff --git a/.config/sway/available/keybinds/scratchpad.conf b/.config/sway/available/keybinds/scratchpad.conf new file mode 100644 index 0000000..ba32708 --- /dev/null +++ b/.config/sway/available/keybinds/scratchpad.conf @@ -0,0 +1,10 @@ +# Sway Config: Scratchpad +# +# Thurstylark + +# 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 diff --git a/.config/sway/available/keybinds/screen-lock.conf b/.config/sway/available/keybinds/screen-lock.conf new file mode 100644 index 0000000..4ef079b --- /dev/null +++ b/.config/sway/available/keybinds/screen-lock.conf @@ -0,0 +1,5 @@ +# Sway Config: Screen Lock Keybind +# +# Thurstylark + +bindsym $mod+Mod1+l exec "$idle-lock-locker" diff --git a/.config/sway/available/keybinds/suspend.conf b/.config/sway/available/keybinds/suspend.conf new file mode 100644 index 0000000..a43c5b5 --- /dev/null +++ b/.config/sway/available/keybinds/suspend.conf @@ -0,0 +1,5 @@ +# Sway Config: System Suspend Keybind +# +# Thurstylark + +bindsym $mod+Mod1+s exec "systemctl suspend" diff --git a/.config/sway/available/24-workspaces.conf b/.config/sway/available/keybinds/workspaces.conf similarity index 90% rename from .config/sway/available/24-workspaces.conf rename to .config/sway/available/keybinds/workspaces.conf index f21dbf4..b6a652c 100644 --- a/.config/sway/available/24-workspaces.conf +++ b/.config/sway/available/keybinds/workspaces.conf @@ -13,7 +13,6 @@ bindsym $mod+7 workspace 7 bindsym $mod+8 workspace 8 bindsym $mod+9 workspace 9 bindsym $mod+0 workspace 10 -bindsym $mod+grave workspace Terminals # Move focused container to workspace bindsym $mod+Shift+1 move container to workspace 1 @@ -26,7 +25,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 -bindsym $mod+Shift+grave move container to workspace Terminals # Move workspace to different output bindsym $mod+m move workspace to output right diff --git a/.config/sway/available/23-resizemode.inc b/.config/sway/available/mode/resize.conf similarity index 95% rename from .config/sway/available/23-resizemode.inc rename to .config/sway/available/mode/resize.conf index feec2ca..d31e258 100644 --- a/.config/sway/available/23-resizemode.inc +++ b/.config/sway/available/mode/resize.conf @@ -24,3 +24,5 @@ mode "resize" { bindsym Escape mode "default" bindsym q mode "default" } + +bindsym $mod+r mode "resize" diff --git a/.config/sway/available/34-output-backlight-configure.conf b/.config/sway/available/output/backlight-min.conf similarity index 100% rename from .config/sway/available/34-output-backlight-configure.conf rename to .config/sway/available/output/backlight-min.conf diff --git a/.config/sway/available/31-output-configure.conf b/.config/sway/available/output/configure.conf similarity index 100% rename from .config/sway/available/31-output-configure.conf rename to .config/sway/available/output/configure.conf diff --git a/.config/sway/available/32-output-default-bg-configure.conf b/.config/sway/available/output/default-bg.conf similarity index 100% rename from .config/sway/available/32-output-default-bg-configure.conf rename to .config/sway/available/output/default-bg.conf diff --git a/.config/sway/available/33-output-random-bg-configure.conf b/.config/sway/available/output/random-bg.conf similarity index 100% rename from .config/sway/available/33-output-random-bg-configure.conf rename to .config/sway/available/output/random-bg.conf diff --git a/.config/sway/available/30-output-sane-default.conf b/.config/sway/available/output/sane-default.conf similarity index 100% rename from .config/sway/available/30-output-sane-default.conf rename to .config/sway/available/output/sane-default.conf