refactor and cleanup sway config

overlays/sway/etc/greetd/sway

 # global variables
-include /etc/sway/config.d/00-global-definitions
+include /etc/sway/definitions
 
-include /etc/sway/inputs/default-touchpad
-include /etc/sway/inputs/default-keyboard-ansi
-include /etc/sway/outputs/default
-
-# colorscheme
-include /etc/sway/themes/matcha-theme
-include /etc/sway/config.d/10-ui-settings
+include /etc/sway/inputs/*
+include /etc/sway/outputs/*
 
 exec "gtkgreet -l -c sway; swaymsg exit"
 bindsym $mod+Shift+e exec wlogout --layout /etc/wlogout/user-loggedout --buttons-per-row 3

overlays/sway/etc/sway/config

@@ -5,20 +5,16 @@
 # Read `man 5 sway` for a complete reference.
 
 # global variables
-include /etc/sway/config.d/00-global-definitions
+include /etc/sway/definitions
 
-include /etc/sway/inputs/default-touchpad
-include /etc/sway/inputs/default-keyboard-ansi
-include /etc/sway/outputs/default
-
-# colorscheme
-include /etc/sway/themes/matcha-theme
-include /etc/sway/config.d/10-ui-settings
+include /etc/sway/inputs/*
+include /etc/sway/outputs/*
 
 # enable modes
-include /etc/sway/config.d/20-normal-mode
-include /etc/sway/config.d/30-scratchpad-mode
-include /etc/sway/config.d/40-resize-mode
+include /etc/sway/modes/*
+
+# only enable this if every app you use is compatible with wayland
+# xwayland disable
 
-# autostart applications
-include /etc/sway/config.d/99-autostart-applications
+# include additional configs e.g. to autostart applications
+include /etc/sway/config.d/*

overlays/sway/etc/sway/config.d/30-scratchpad-mode

-#
-# Scratchpad:
-#
-    # Sway has a "scratchpad", which is a bag of holding for windows.
-    # You can send windows there and get them back later.
-
-    # 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
-

overlays/sway/etc/sway/config.d/99-autostart-applications

 exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-exec --no-startup-id mako --default-timeout 5000 --icons 1  --markup 1 --actions 1 --background-color $base07
+exec --no-startup-id mako --default-timeout 5000 --icons 1  --markup 1 --actions 1
 exec --no-startup-id pamac-tray-appindicator
 exec --no-startup-id nm-applet --indicator
 exec --no-startup-id blueman-applet

overlays/sway/etc/sway/config.d/00-global-definitions → overlays/sway/etc/sway/definitions

@@ -9,8 +9,12 @@ set $down j
 set $up k
 set $right l
 
+# styles
+set $theme matcha
+set $background /usr/share/wallpapers/manjaro-arm/generic/manjaro-arm2.png
+
 # Your preferred terminal emulator
-set $term termite --config /etc/termite/config
+set $term termite
 
 # Your preferred application launcher
 # Note: pass the final command to swaymsg so that the resulting window can be opened

overlays/sway/etc/sway/inputs/default-keyboard-ansi → overlays/sway/etc/sway/inputs/default-keyboard

 ### Input configuration
 #
-# Example configuration:
-#
-#   input "2:14:SynPS/2_Synaptics_TouchPad" {
-#       dwt enabled
-#       tap enabled
-#       natural_scroll enabled
-#       middle_emulation enabled
-#   }
-#
 # You can get the names of your inputs by running: swaymsg -t get_inputs
 # Read `man 5 sway-input` for more information about this section.
 input type:keyboard {
     xkb_layout us
     #xkb_options ctrl:nocaps
 }
-

overlays/sway/etc/sway/inputs/default-keyboard-iso

-### Input configuration
-#
-# Example configuration:
-#
-#   input "2:14:SynPS/2_Synaptics_TouchPad" {
-#       dwt enabled
-#       tap enabled
-#       natural_scroll enabled
-#       middle_emulation enabled
-#   }
-#
-# You can get the names of your inputs by running: swaymsg -t get_inputs
-# Read `man 5 sway-input` for more information about this section.
-input type:keyboard {
-    xkb_layout gb
-    #xkb_options ctrl:nocaps
-}
-

overlays/sway/etc/sway/inputs/default-touchpad

 ### Input configuration
 #
-# Example configuration:
-#
-#   input "2:14:SynPS/2_Synaptics_TouchPad" {
-#       dwt enabled
-#       tap enabled
-#       natural_scroll enabled
-#       middle_emulation enabled
-#   }
-#
 # You can get the names of your inputs by running: swaymsg -t get_inputs
 # Read `man 5 sway-input` for more information about this section.
 input type:touchpad {

overlays/sway/etc/sway/modes/scratchpad-mode

+#
+# Scratchpad:
+#
+# Sway has a "scratchpad", which is a bag of holding for windows.
+# You can send windows there and get them back later.
+
+# 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
+

overlays/sway/etc/sway/outputs/default

 ### Output configuration
 #
-#
 # Example configuration:
 #
 #   output HDMI-A-1 resolution 1920x1080 position 1920,0
 #
 # You can get the names of your outputs by running: swaymsg -t get_outputs
 
+# import theme
+include /etc/sway/themes/$theme
+
 # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
-output * bg /usr/share/wallpapers/manjaro-arm/generic/manjaro-arm2.png fill
+output * bg $background fill

overlays/sway/etc/sway/config.d/10-ui-settings → overlays/sway/etc/sway/themes/matcha

+# based on Base16 Solar Flare by Chuck Harmston (https://chuck.harmston.ch)
+
+set $base00 #1B2224
+set $base01 #222E38
+set $base02 #586875
+set $base03 #667581
+set $base04 #85939E
+set $base05 #A6AFB8
+set $base06 #E8E9ED
+set $base07 #F5F7FA
+set $base08 #EF5253
+set $base09 #E66B2B
+set $base0A #E4B51C
+set $base0B #7CC844
+set $base0C #52CBB0
+set $base0D #33B5E1
+set $base0E #A363D5
+set $base0F #D73C9A
+
 default_border pixel 1
 hide_edge_borders smart
 
@@ -9,7 +28,3 @@ client.unfocused        $base01 $base00 $base05 $base01 $base01
 client.urgent           $base08 $base08 $base00 $base08 $base08
 client.placeholder      $base00 $base00 $base05 $base00 $base00
 client.background       $base07
-
-# only enable this if every app you use is compatible with wayland
-# xwayland disable
-

overlays/sway/etc/sway/themes/matcha-theme

-## based on Base16 Solar Flare by Chuck Harmston (https://chuck.harmston.ch)
-
-set $base00 #1B2224
-set $base01 #222E38
-set $base02 #586875
-set $base03 #667581
-set $base04 #85939E
-set $base05 #A6AFB8
-set $base06 #E8E9ED
-set $base07 #F5F7FA
-set $base08 #EF5253
-set $base09 #E66B2B
-set $base0A #E4B51C
-set $base0B #7CC844
-set $base0C #52CBB0
-set $base0D #33B5E1
-set $base0E #A363D5
-set $base0F #D73C9A