The utils experiment was a bust. Time to fall back.

.config/sway/available/general/variables.conf

@@ -2,9 +2,6 @@
 #
 # Thurstylark
 
-# Get hostname
-set $hostname "$(uname -n)"
-
 # Directories
 set $dir-conf ~/.config/sway
 set $dir-localconf $dir-conf/$hostname

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

@@ -2,10 +2,4 @@
 #
 # 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/output/default-bg.conf

@@ -2,10 +2,8 @@
 #
 # 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
+output $o-id bg $o-bg-path fill $o-bg-fill

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

@@ -8,4 +8,4 @@ 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
+output $o-id bg $o-bg-path fill $o-bg-fill

.config/sway/config

@@ -2,8 +2,8 @@
 #
 # Thurstylark
 
-# Include all common configs
+# Get hostname
-#include ~/.config/sway/common/*.conf
+set $hostname "$(uname -n)"
 
 # Include all configs by hostname
 include ~/.config/sway/$hostname/*.conf

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

@@ -9,5 +9,7 @@ set $o-pos-y "0"
 
 
 # Do the thing
-$u-output-set-mode
+output $o-id {
-$u-output-set-position
+	mode $o-mode
+	pos $o-pos-x $o-pos-y
+}

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

@@ -9,5 +9,7 @@ set $o-pos-y "0"
 
 
 # Do the thing
-$u-output-set-mode
+output $o-id {
-$u-output-set-position
+	mode $o-mode
+	pos $o-pos-x $o-pos-y
+}

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

@@ -9,5 +9,7 @@ set $o-pos-y "0"
 
 
 # Do the thing
-$u-output-set-mode
+output $o-id {
-$u-output-set-position
+	mode $o-mode
+	pos $o-pos-x $o-pos-y
+}

.config/sway/template/outputs/example.conf

@@ -21,7 +21,9 @@ set $o-transform "90"
 
 # Do the thing
 #  (comment or remove direcives that are unnecessary to avoid errors)
-$u-output-set-mode
+output $o-id {
-$u-output-set-position
+	mode $o-mode
-$u-output-set-scale
+	position $o-pos-x $o-pos-y
-$u-output-set-transform
+	scale $o-scalefactor
+	transform $o-transform
+}

.config/sway/utils/output/set-bg

@@ -1,5 +0,0 @@
-# Sway config: Configure Output: Wallpaper
-#
-# Thurstylark
-
-set $u-output-set-bg "output $$o-id bg $$o-bg-path fill $$o-bg-fill"

.config/sway/utils/output/set-mode

@@ -1,5 +0,0 @@
-# Sway config: Configure Output: Mode
-#
-# Thurstylark
-
-set $u-output-set-mode "output $$o-id mode $$o-mode"

.config/sway/utils/output/set-position

@@ -1,5 +0,0 @@
-# Sway config: Configure Output: Position
-#
-# Thurstylark
-
-set $u-output-set-position "output $$o-id pos $$o-pos-x $$o-pos-y"

.config/sway/utils/output/set-scale

@@ -1,5 +0,0 @@
-# Sway config: Configure Output: Scale
-#
-# Thurstylark
-
-set $u-output-set-scale "output $$o-id scale $$o-scalefactor"

.config/sway/utils/output/set-transform

@@ -1,5 +0,0 @@
-# Sway config: Configure Output: Transform
-#
-# Thurstylark
-
-set $u-output-set-transform "output $$o-id transform $$o-transform"