home/Northstar.nix

@@ -1,42 +1,8 @@
 {...}: {
   imports = [./default.nix];
-  wayland.windowManager.sway.config = let
-    defaultOutput = "eDP-1";
-  in {
-    output.${defaultOutput}.scale = "1.25";
-    workspaceOutputAssign = [
-      {
-        output = defaultOutput;
-        workspace = "1";
-      }
-    ];
+  wayland.windowManager.sway.config.output = {
+    "eDP-1" = {
+      scale = "1.25";
     };
-  services.kanshi = {
-    enable = true;
-    settings = let
-      laptopScreen = {
-        criteria = "eDP-1";
-        scale = 1.25;
-        position = "3000,636";
-      };
-      monitor1 = {
-        criteria = "Acer Technologies ED270R TJMEE0043W01";
-        mode = "1920x1080@165Hz";
-        position = "1080,420";
-      };
-      monitor2 = {
-        criteria = "Ancor Communications Inc VS278 FALMQS032358";
-        position = "0,0";
-        transform = "270";
-      };
-    in [
-      {output = laptopScreen;}
-      {
-        profile = {
-          name = "docked";
-          outputs = [laptopScreen monitor1 monitor2];
-        };
-      }
-    ];
   };
 }

home/Scorch.nix

@@ -1,6 +1,9 @@
 {...}: {
   imports = [./work.nix];
-  wayland.windowManager.sway.config = {
-    output."Dell Inc. DELL P3223QE CCG8YN3".scale = "1.5";
+  wayland.windowManager.sway.config.output = {
+    "Dell Inc. DELL P3223QE CCG8YN3" = {
+      pos = "0 0";
+      scale = "1.5";
+    };
   };
 }

home/Tone.nix

@@ -1,37 +1,34 @@
 {...}: {
   imports = [./work.nix];
-  wayland.windowManager.sway.config = let
-    defaultOutput = "eDP-1";
-  in {
-    output.${defaultOutput}.scale = "1.25";
-    workspaceOutputAssign = [
-      {
-        output = defaultOutput;
-        workspace = "1";
-      }
-    ];
+  wayland.windowManager.sway.config.output = {
+    "eDP-1" = {
+      scale = "1.25";
+      position = "2560 576";
+    };
+    "Dell Inc. DELL P3223QE CCG8YN3" = {
+      scale = "1.5";
+      position = "0 0";
+    };
   };
   services.kanshi = {
     enable = true;
-    settings = let
+    systemdTarget = "sway-session.target";
+    profiles = let
       laptopScreen = {
         criteria = "eDP-1";
-        scale = 1.25;
-        position = "2560,576";
+        status = "enable";
       };
       monitor = {
         criteria = "Dell Inc. DELL P3223QE CCG8YN3";
-        scale = 1.5;
-        position = "0,0";
+        status = "enable";
+      };
+    in {
+      undocked = {
+        outputs = [laptopScreen];
+      };
+      docked = {
+        outputs = [monitor laptopScreen];
+      };
     };
-    in [
-      {output = laptopScreen;}
-      {
-        profile = {
-          name = "docked";
-          outputs = [laptopScreen monitor];
-        };
-      }
-    ];
   };
 }

home/Vanguard.nix

@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   imports = [
     ./default.nix
     ../programs/games/default.nix
@@ -12,39 +8,30 @@
     freecad
     prusa-slicer
   ];
-  wayland.windowManager.sway.config = let
-    defaultOutput = "DP-2";
-  in {
+  wayland.windowManager.sway.config = {
+    startup = [
+      {command = "${pkgs.xorg.xrandr}/bin/xrandr --output DP-2 --primary";}
+    ];
     output = {
       "Acer Technologies ED270R TJMEE0043W01" = {
         mode = "1920x1080@165Hz";
-        position = "1080 420";
+        pos = "1080 420";
         adaptive_sync = "off";
       };
       "Ancor Communications Inc VS278 FALMQS032358" = {
-        position = "0 0";
+        pos = "0 0";
         transform = "270";
       };
     };
     workspaceOutputAssign = [
       {
-        output = defaultOutput;
+        output = "HDMI-A-1";
         workspace = "1";
       }
     ];
-    startup = [
-      {command = "${pkgs.xorg.xrandr}/bin/xrandr --output ${defaultOutput} --primary";}
-    ];
   };
   programs.waybar.settings = {
     main.output = ["DP-2"];
-    alt = {
-      inherit (config.programs.waybar.settings.main) layer position "sway/workspaces";
-      name = "alt";
-      output = ["HDMI-A-1"];
-      "modules-left" = ["sway/workspaces"];
-      "modules-center" = [];
-      "modules-right" = ["clock"];
-    };
+    alt.output = ["HDMI-A-1"];
   };
 }

programs/desktop/sway/default.nix

@@ -7,8 +7,6 @@
   accentColour2,
   ...
 }: {
-  programs.waybar.systemd.target = lib.mkIf config.wayland.windowManager.sway.systemd.enable "sway-session.target";
-  services.kanshi.systemdTarget = lib.mkIf config.wayland.windowManager.sway.systemd.enable "sway-session.target";
   wayland.windowManager.sway = {
     enable = true;
     package =

programs/desktop/waybar/default.nix

@@ -1,6 +1,8 @@
 {
   config,
+  lib,
   pkgs,
+  hostname,
   fonts,
   accentColour,
   ...
@@ -11,8 +13,12 @@
   };
   programs.waybar = {
     enable = true;
-    systemd.enable = true;
-    settings.main = {
+    systemd = {
+      enable = true;
+      target = "sway-session.target";
+    };
+    settings = rec {
+      main = {
         name = "main";
         layer = "top";
         position = "bottom";
@@ -231,6 +237,15 @@
           spacing = 5;
         };
       };
+      # TEMP FIX
+      alt = lib.mkIf (hostname == "Vanguard") {
+        inherit (main) layer position "sway/workspaces";
+        name = "alt";
+        "modules-left" = [];
+        "modules-center" = ["sway/workspaces"];
+        "modules-right" = [];
+      };
+    };
     style = with config.scheme.withHashtag; let
       accent = config.scheme.withHashtag.${accentColour};
       alpha = "0.9";