Adapting output config to new structure

.config/sway/available/10-variables.conf

@@ -5,6 +5,15 @@
 # Get hostname
 set $hostname "$(uname -n)"
 
+# Directories
+set $dir-conf ~/.config/sway
+set $dir-localconf $dir-conf/$hostname
+set $dir-utils $dir-conf/utils
+set $dir-wallpapers /usr/share/backgrounds
+
+# Default Background
+set $default-background $dir-wallpapers/thurstylark/spacetux.jpg
+
 # Using Logo key
 set $mod Mod4
 
@@ -20,8 +29,10 @@ set $term alacritty
 # Preferred application launcher
 # Note: pass the final command to swaymsg so that the resulting window can be opened
 # on the original workspace that the command was run on.
-#set $menu bemenu-run --no-exec --monitor=all | xargs swaymsg exec --
 set $menu bemenu-run --no-exec | xargs swaymsg exec --
 
 # Cursor hide delay (in ms)
 set $cursor-hide-delay "4000"
+
+# Minimum Brightness
+set $minimum-brightness "6"

.config/sway/available/30-output-sane-default.conf

@@ -1,4 +1,4 @@
-# Sway config: Output
+# Sway config: Output: Default
 #
 # Thurstylark
 

.config/sway/available/31-output-configure.conf

@@ -0,0 +1,11 @@
+# Sway Config: Output
+#
+# Thurstylark
+
+# Tools for setting output configuration
+include $dir-utils/output/set-mode
+include $dir-utils/output/set-position
+include $dir-utils/output/set-scale
+include $dir-utils/output/set-transform
+
+include $dir-localconf/outputs/*.conf

.config/sway/available/32-output-default-bg-configure.conf

@@ -0,0 +1,11 @@
+# Sway Config: Default Background Configure
+#
+# Thurstylark
+
+include $dir-utils/output/set-bg
+
+set $o-id "*"
+set $o-bg-path $default-background
+set $o-bg-fill "#000000"
+
+$u-output-set-bg

.config/sway/available/33-output-random-bg-configure.conf

@@ -0,0 +1,11 @@
+# Sway Config: Random Background Configure
+#
+# Thurstylark
+
+include $dir-utils/output/set-bg
+
+set $o-id "*"
+set $o-bg-path $$(find $dir-wallpapers -type f \( -iname \*.jpg -o -iname \*.png \) -not -path $dir-wallpapers/sway/\* | shuf -n 1 )
+set $o-bg-fill "#000000"
+
+$u-output-set-bg

.config/sway/available/34-output-backlight-configure.conf

@@ -0,0 +1,6 @@
+# Sway Config: Backlight Config
+#
+# Thurstylark
+
+# Set minimum brightness
+exec "light -N $minimum-brightness"

.config/sway/available/42-cursor-hide.conf

@@ -0,0 +1,7 @@
+# Sway Config: Input Config; Cursor Hiding
+#
+# Thurstylark
+
+# Hide cursor after delay
+#  ($cursor-hide-delay from variables config)
+seat * hide_cursor $cursor-hide-delay

.config/sway/kd-laptop/30-output-sane-default.conf

@@ -0,0 +1 @@
+available/30-output-sane-default.conf

.config/sway/kd-laptop/31-output-configure.conf

@@ -0,0 +1 @@
+available/31-output-configure.conf

.config/sway/kd-laptop/40-output.conf

@@ -1,43 +0,0 @@
-# Sway config: Output
-#
-# Thurstylark
-
-# Setup for built-in monitor
-set $o-internal-id "eDP-1"
-set $o-internal-mode "1920x1080@60Hz"
-set $o-internal-pos-x "0"
-set $o-internal-pos-y "0"
-
-# Setup for 4k monitor attached to work dock
-set $o-dock4k-id "Samsung Electric Company U32J59x H4ZM800632"
-set $o-dock4k-mode "2560x1440@59Hz"
-set $o-dock4k-pos-x "1920"
-set $o-dock4k-pos-y "0"
-
-# Setup for 1080 monitor attached to work dock
-set $o-docklg-id "Goldstar Company Ltd LG FULL HD 503NDWEH8441"
-set $o-docklg-mode "1920x1080@60Hz"
-set $o-docklg-pos-x "4480"
-set $o-docklg-pos-y "0"
-
-# Setup for personal ultrawide monitor
-set $o-puwide-id "Unknown ASUS VP348 0x0000CA5D"
-set $o-puwide-mode "3440x1440@59Hz"
-set $o-puwide-pos-x "1920"
-set $o-puwide-pos-y "0"
-
-
-# Sane default of 1080p60
-output * mode 1920x1080@60Hz
-
-# Desktop wallpaper
-output * bg ~/.config/sway/$hostname/bg fill #000000
-
-# Set minimum brightness
-exec "light -N 6"
-
-# Set monitors for work dock
-output $o-internal-id pos $o-internal-pos-x $o-internal-pos-y mode $o-internal-mode
-output $o-dock4k-id pos $o-dock4k-pos-x $o-dock4k-pos-y mode $o-dock4k-mode
-output $o-docklg-id pos $o-docklg-pos-x $o-docklg-pos-y mode $o-docklg-mode
-output $o-puwide-id pos $o-puwide-pos-x $o-puwide-pos-y mode $o-puwide-mode

.config/sway/kd-laptop/outputs/desk-primary.conf

@@ -0,0 +1,13 @@
+# Sway Config: Output
+#
+# Thurstylark
+
+set $o-id "Samsung Electric Company U32J59x H4ZM800632"
+set $o-mode "2560x1440@59Hz"
+set $o-pos-x "1920"
+set $o-pos-y "0"
+
+
+# Do the thing
+$u-output-set-mode
+$u-output-set-position

.config/sway/kd-laptop/outputs/desk-secondary.conf

@@ -0,0 +1,13 @@
+# Sway Config: Output
+#
+# Thurstylark
+
+set $o-id "Goldstar Company Ltd LG FULL HD 503NDWEH8441"
+set $o-mode "1920x1080@60Hz"
+set $o-pos-x "4480"
+set $o-pos-y "0"
+
+
+# Do the thing
+$u-output-set-mode
+$u-output-set-position

.config/sway/kd-laptop/outputs/laptop.conf

@@ -0,0 +1,13 @@
+# Sway Config: Output
+#
+# Thurstylark
+
+set $o-id "eDP-1"
+set $o-mode "1920x1080@60Hz"
+set $o-pos-x "0"
+set $o-pos-y "0"
+
+
+# Do the thing
+$u-output-set-mode
+$u-output-set-position