From 34236ae28ccf7118a42bae1cbee65a9a088ba9bf Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sun, 4 Jun 2023 10:01:07 +0100
Subject: [PATCH] Move sway config fully into nix expressions

---
 home/Northstar/sway/backup | 195 -------------------------------------
 home/Northstar/sway/config | 170 +++++++++++++++++++++++++++++++-
 home/Northstar/xenia.nix   |  23 ++++-
 home/desktop/sway.nix      |   9 +-
 4 files changed, 195 insertions(+), 202 deletions(-)
 delete mode 100644 home/Northstar/sway/backup

diff --git a/home/Northstar/sway/backup b/home/Northstar/sway/backup
deleted file mode 100644
index 81ed5a07..00000000
--- a/home/Northstar/sway/backup
+++ /dev/null
@@ -1,195 +0,0 @@
-# Default config for sway
-#
-# Copy this to ~/.config/sway/config and edit it to your liking.
-#
-# Read `man 5 sway` for a complete reference.
-
-### Variables
-set $mod Mod1
-set $left h
-set $down j
-set $up k
-set $right l
-set $term foot
-# Your 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 rofi -show drun
-
-include /etc/sway/config-vars.d/*
-
-### Output configuration
-output DSI-1 scale 2.0 transform 270
-input type:touch map_to_output DSI-1
-input type:touchpad click_method clickfinger
-
-# this is for Lenovo's USI pen
-input 10182:3632:hid-over-i2c_27C6:0E30 map_to_output DSI-1
-
-bindsym $mod+F6 exec brightnessctl s 5%-
-bindsym $mod+F7 exec brightnessctl s 5%+
-
-
-gaps inner 5
-gaps outer 20
-default_border pixel 2
-
-### Input configuration
-input * {
-    xkb_layout gb
-}
-
-#
-# Workspaces
-#
-set $ws1 "1"
-set $ws2 "2"
-set $ws3 "3"
-set $ws4 "4"
-set $ws5 "5"
-set $ws6 "6"
-set $ws7 "7"
-set $ws8 "8"
-set $ws9 "9"
-
-workspace $ws1 output DSI-1
-workspace $ws2 output DSI-1
-workspace $ws3 output DSI-1
-workspace $ws4 output DSI-1
-workspace $ws5 output DSI-1
-workspace $ws6 output DSI-1
-workspace $ws7 output DSI-1
-workspace $ws8 output DSI-1
-
-assign [app_id="foot"] $ws1
-assign [class="(?i)firefox"] $ws2
-assign [app_id="(?i)firefox"] $ws2
-assign [class="(?i)chromium"] $ws2
-assign [app_id="(?i)chromium"] $ws2
-assign [class="org.kde.dolphin"] $ws3
-assign [class="thunderbird"] $ws4
-assign [class="Mailspring"] $ws4
-assign [class="Element"] $ws5
-assign [class="Signal"] $ws5
-assign [class="Steam"] $ws6
-assign [class="Bitwarden"] $ws7
-assign [class="Nxplayer.bin"] $ws8
-
-for_window [app_id="pavucontrol"] floating enable
-
-### Key bindings
-bindsym $mod+Return exec $term
-bindsym $mod+q kill
-bindsym $mod+space exec $menu
-bindsym $mod+e exec power-profiles
-bindsym $mod+p exec wlogout
-bindsym $mod+F1 exec swaylock
-bindsym $mod+w exec chromium
-bindsym $mod+f exec $term -e ranger
-bindsym $mod+Shift+f exec dolphin
-
-floating_modifier $mod normal
-
-# Reload the configuration file
-bindsym $mod+Shift+r reload
-
-# Exit sway (logs you out of your Wayland session)
-bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
-
-# Move your focus around
-bindsym $mod+$left focus left
-bindsym $mod+$down focus down
-bindsym $mod+$up focus up
-bindsym $mod+$right focus right
-# Or use $mod+[up|down|left|right]
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
-# Move the focused window with the same, but add Shift
-bindsym $mod+Shift+$left move left
-bindsym $mod+Shift+$down move down
-bindsym $mod+Shift+$up move up
-bindsym $mod+Shift+$right move right
-# Ditto, with arrow keys
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
-
-# Switch to workspace
-bindsym $mod+1 workspace number $ws1
-bindsym $mod+2 workspace number $ws2
-bindsym $mod+3 workspace number $ws3
-bindsym $mod+4 workspace number $ws4
-bindsym $mod+5 workspace number $ws5
-bindsym $mod+6 workspace number $ws6
-bindsym $mod+7 workspace number $ws7
-bindsym $mod+8 workspace number $ws8
-bindsym $mod+9 workspace number $ws9
-bindsym $mod+0 workspace number $ws10
-# Move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace number $ws1
-bindsym $mod+Shift+2 move container to workspace number $ws2
-bindsym $mod+Shift+3 move container to workspace number $ws3
-bindsym $mod+Shift+4 move container to workspace number $ws4
-bindsym $mod+Shift+5 move container to workspace number $ws5
-bindsym $mod+Shift+6 move container to workspace number $ws6
-bindsym $mod+Shift+7 move container to workspace number $ws7
-bindsym $mod+Shift+8 move container to workspace number $ws8
-bindsym $mod+Shift+9 move container to workspace number $ws9
-bindsym $mod+Shift+0 move container to workspace number $ws10
-# Note: workspaces can have any name you want, not just numbers.
-# We just use 1-10 as the default.
-
-# Make the current focus fullscreen
-bindsym $mod+m fullscreen
-
-# Toggle the current focus between tiling and floating mode
-bindsym $mod+v floating toggle
-
-# Move the currently focused window to the scratchpad
-bindsym $mod+Shift+c 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+c scratchpad show
-#
-# Resizing containers:
-#
-mode "resize" {
-    # left will shrink the containers width
-    # right will grow the containers width
-    # up will shrink the containers height
-    # down will grow the containers height
-    bindsym $left resize shrink width 10px
-    bindsym $down resize grow height 10px
-    bindsym $up resize shrink height 10px
-    bindsym $right resize grow width 10px
-
-    # Ditto, with arrow keys
-    bindsym Left resize shrink width 10px
-    bindsym Down resize grow height 10px
-    bindsym Up resize shrink height 10px
-    bindsym Right resize grow width 10px
-
-    # Return to default mode
-    bindsym Return mode "default"
-    bindsym Escape mode "default"
-}
-bindsym $mod+r mode "resize"
-
-#
-# Status Bar:
-#
-# Read `man 5 sway-bar` for more information about this section.
-
-include /etc/sway/config.d/*
-
-exec dunst
-# exec hyprpaper
-exec waybar
-# exec eww daemon
-
-# vim: ft=i3config
diff --git a/home/Northstar/sway/config b/home/Northstar/sway/config
index 548a7891..81ed5a07 100644
--- a/home/Northstar/sway/config
+++ b/home/Northstar/sway/config
@@ -1,3 +1,23 @@
+# Default config for sway
+#
+# Copy this to ~/.config/sway/config and edit it to your liking.
+#
+# Read `man 5 sway` for a complete reference.
+
+### Variables
+set $mod Mod1
+set $left h
+set $down j
+set $up k
+set $right l
+set $term foot
+# Your 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 rofi -show drun
+
+include /etc/sway/config-vars.d/*
+
 ### Output configuration
 output DSI-1 scale 2.0 transform 270
 input type:touch map_to_output DSI-1
@@ -6,8 +26,8 @@ input type:touchpad click_method clickfinger
 # this is for Lenovo's USI pen
 input 10182:3632:hid-over-i2c_27C6:0E30 map_to_output DSI-1
 
-bindsym Mod1+F6 exec brightnessctl s 5%-
-bindsym Mod1+F7 exec brightnessctl s 5%+
+bindsym $mod+F6 exec brightnessctl s 5%-
+bindsym $mod+F7 exec brightnessctl s 5%+
 
 
 gaps inner 5
@@ -19,8 +39,154 @@ input * {
     xkb_layout gb
 }
 
+#
+# Workspaces
+#
+set $ws1 "1"
+set $ws2 "2"
+set $ws3 "3"
+set $ws4 "4"
+set $ws5 "5"
+set $ws6 "6"
+set $ws7 "7"
+set $ws8 "8"
+set $ws9 "9"
+
+workspace $ws1 output DSI-1
+workspace $ws2 output DSI-1
+workspace $ws3 output DSI-1
+workspace $ws4 output DSI-1
+workspace $ws5 output DSI-1
+workspace $ws6 output DSI-1
+workspace $ws7 output DSI-1
+workspace $ws8 output DSI-1
+
+assign [app_id="foot"] $ws1
+assign [class="(?i)firefox"] $ws2
+assign [app_id="(?i)firefox"] $ws2
+assign [class="(?i)chromium"] $ws2
+assign [app_id="(?i)chromium"] $ws2
+assign [class="org.kde.dolphin"] $ws3
+assign [class="thunderbird"] $ws4
+assign [class="Mailspring"] $ws4
+assign [class="Element"] $ws5
+assign [class="Signal"] $ws5
+assign [class="Steam"] $ws6
+assign [class="Bitwarden"] $ws7
+assign [class="Nxplayer.bin"] $ws8
+
 for_window [app_id="pavucontrol"] floating enable
 
+### Key bindings
+bindsym $mod+Return exec $term
+bindsym $mod+q kill
+bindsym $mod+space exec $menu
+bindsym $mod+e exec power-profiles
+bindsym $mod+p exec wlogout
+bindsym $mod+F1 exec swaylock
+bindsym $mod+w exec chromium
+bindsym $mod+f exec $term -e ranger
+bindsym $mod+Shift+f exec dolphin
+
+floating_modifier $mod normal
+
+# Reload the configuration file
+bindsym $mod+Shift+r reload
+
+# Exit sway (logs you out of your Wayland session)
+bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
+
+# Move your focus around
+bindsym $mod+$left focus left
+bindsym $mod+$down focus down
+bindsym $mod+$up focus up
+bindsym $mod+$right focus right
+# Or use $mod+[up|down|left|right]
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
+
+# Move the focused window with the same, but add Shift
+bindsym $mod+Shift+$left move left
+bindsym $mod+Shift+$down move down
+bindsym $mod+Shift+$up move up
+bindsym $mod+Shift+$right move right
+# Ditto, with arrow keys
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
+
+# Switch to workspace
+bindsym $mod+1 workspace number $ws1
+bindsym $mod+2 workspace number $ws2
+bindsym $mod+3 workspace number $ws3
+bindsym $mod+4 workspace number $ws4
+bindsym $mod+5 workspace number $ws5
+bindsym $mod+6 workspace number $ws6
+bindsym $mod+7 workspace number $ws7
+bindsym $mod+8 workspace number $ws8
+bindsym $mod+9 workspace number $ws9
+bindsym $mod+0 workspace number $ws10
+# Move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace number $ws1
+bindsym $mod+Shift+2 move container to workspace number $ws2
+bindsym $mod+Shift+3 move container to workspace number $ws3
+bindsym $mod+Shift+4 move container to workspace number $ws4
+bindsym $mod+Shift+5 move container to workspace number $ws5
+bindsym $mod+Shift+6 move container to workspace number $ws6
+bindsym $mod+Shift+7 move container to workspace number $ws7
+bindsym $mod+Shift+8 move container to workspace number $ws8
+bindsym $mod+Shift+9 move container to workspace number $ws9
+bindsym $mod+Shift+0 move container to workspace number $ws10
+# Note: workspaces can have any name you want, not just numbers.
+# We just use 1-10 as the default.
+
+# Make the current focus fullscreen
+bindsym $mod+m fullscreen
+
+# Toggle the current focus between tiling and floating mode
+bindsym $mod+v floating toggle
+
+# Move the currently focused window to the scratchpad
+bindsym $mod+Shift+c 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+c scratchpad show
+#
+# Resizing containers:
+#
+mode "resize" {
+    # left will shrink the containers width
+    # right will grow the containers width
+    # up will shrink the containers height
+    # down will grow the containers height
+    bindsym $left resize shrink width 10px
+    bindsym $down resize grow height 10px
+    bindsym $up resize shrink height 10px
+    bindsym $right resize grow width 10px
+
+    # Ditto, with arrow keys
+    bindsym Left resize shrink width 10px
+    bindsym Down resize grow height 10px
+    bindsym Up resize shrink height 10px
+    bindsym Right resize grow width 10px
+
+    # Return to default mode
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+}
+bindsym $mod+r mode "resize"
+
+#
+# Status Bar:
+#
+# Read `man 5 sway-bar` for more information about this section.
+
+include /etc/sway/config.d/*
+
 exec dunst
 # exec hyprpaper
 exec waybar
diff --git a/home/Northstar/xenia.nix b/home/Northstar/xenia.nix
index 018a0839..3389a961 100644
--- a/home/Northstar/xenia.nix
+++ b/home/Northstar/xenia.nix
@@ -16,7 +16,28 @@
   '';
   programs.firefox.enable = true;
 
-  wayland.windowManager.sway.extraConfig = builtins.readFile ./sway/config;
+  wayland.windowManager.sway = {
+    config = {
+      input = {
+        "*" = {xkb_layout = "gb";};
+        "touch" = {map_to_output = "DSI-1";};
+        "touchpad" = {click_method = "clickfinger";};
+        "10182:3632:hid-over-i2c_27C6:0E30" = {map_to_output = "DSI-1";};
+      };
+      modifier = "Mod1";
+      output = {
+        DSI-1 = {
+          scale = 2.0;
+          transform = 270;
+        };
+      };
+      startup = [
+        {command = "dunst";}
+        # {command = "hyprpaper";}
+        {command = "waybar";}
+      ];
+    };
+  };
   programs.waybar = {
     settings = {
       main = {
diff --git a/home/desktop/sway.nix b/home/desktop/sway.nix
index 1730cf30..6ca5645e 100644
--- a/home/desktop/sway.nix
+++ b/home/desktop/sway.nix
@@ -19,12 +19,13 @@
   wayland.windowManager.sway = {
     enable = true;
     config = {
+      fonts = {
+        names = ["FiraCode Nerd Font" "FiraCode Nerd Font Mono"];
+        size = 12.0;
+      };
       gaps = {
         inner = 5;
-        left = 20;
-        right = 20;
-        top = 5;
-        bottom = 5;
+        outer = 20;
       };
       bars = null;
     };