Updating structure for shared configs

.config/sway/available/20-keybindings.conf

@@ -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
-

.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
+    }
+}

.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

.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

.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"

.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

.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

.config/sway/available/keybinds/passmenu.conf

@@ -0,0 +1,5 @@
+# Sway Config: Passmenu
+#
+# Thurstylark
+
+bindsym $mod+p exec passmenu

.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"

.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%"

.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

.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"

.config/sway/available/keybinds/suspend.conf

@@ -0,0 +1,5 @@
+# Sway Config: System Suspend Keybind
+#
+# Thurstylark
+
+bindsym $mod+Mod1+s exec "systemctl suspend"

.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

.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"