Remove kanshi

hosts/omega/default.nix

@@ -1,6 +1,7 @@
 { ... }: {
   imports = [
     ./hardware.nix
+    ./sway.nix
     ../../overlays
     ../../modules/base
     ../../modules/desktop

hosts/omega/sway.nix

@@ -0,0 +1,18 @@
+{ home-manager, ... }: {
+  home-manager.users.caspervk = {
+    wayland.windowManager.sway = {
+      config = {
+        output = {
+          "ASUSTek COMPUTER INC ROG XG27AQ M3LMQS370969" = {
+            mode = "2560x1440@144.006Hz";
+            position = "0,0";
+          };
+          "BNQ BenQ XL2411Z SCD06385SL0" = {
+            mode = "1920x1080@144.001Hz";
+            position = "2560,200";
+          };
+        };
+      };
+    };
+  };
+}

hosts/zeta/default.nix

@@ -1,6 +1,7 @@
 { ... }: {
   imports = [
     ./hardware.nix
+    ./sway.nix
     ../../overlays
     ../../modules/base
     ../../modules/desktop

hosts/zeta/sway.nix

@@ -0,0 +1,14 @@
+{ home-manager, ... }: {
+  home-manager.users.caspervk = {
+    wayland.windowManager.sway = {
+      config = {
+        output = {
+          "Chimei Innolux Corporation 0x14D2 Unknown" = {
+            mode = "1920x1080@60.008Hz";
+            position = "0,0";
+          };
+        };
+      };
+    };
+  };
+}

modules/desktop/default.nix

@@ -3,7 +3,6 @@
     ./alacritty.nix
     ./clipman.nix
     ./gammastep.nix
-    ./kanshi.nix
     ./network.nix
     ./pipewire.nix
     ./programs.nix

modules/desktop/kanshi.nix

@@ -1,35 +0,0 @@
-{ home-manager, ... }: {
-  # kanshi allows you to define output profiles that are automatically enabled
-  # and disabled on hotplug. For instance, this can be used to turn a laptop's
-  # internal screen off when docked. This is a Wayland equivalent for tools
-  # like autorandr.
-  # https://sr.ht/~emersion/kanshi/
-
-  home-manager.users.caspervk = {
-    services.kanshi = {
-      enable = true;
-      profiles = {
-        # Output names (criteria) from `swaymsg -t get_outputs`.
-        omega.outputs = [
-          {
-            criteria = "ASUSTek COMPUTER INC ROG XG27AQ M3LMQS370969";
-            mode = "2560x1440@144Hz";
-            position = "0,0";
-            adaptiveSync = false; # seems to flicker
-          }
-          {
-            criteria = "BNQ BenQ XL2411Z SCD06385SL0";
-            mode = "1920x1080@144Hz";
-            position = "2560,200";
-          }
-        ];
-        zeta.outputs = [
-          {
-            criteria = "Chimei Innolux Corporation 0x14D2 Unknown";
-            mode = "1920x1080@60Hz";
-          }
-        ];
-      };
-    };
-  };
-}

modules/desktop/sway.nix

@@ -26,7 +26,7 @@
         };
         output = {
           "*" = {
-            bg = "${./img/background.png} fill";
+            background = "${./img/background.png} fill";
           };
         };
         modifier = "Mod4"; # super
@@ -65,6 +65,9 @@
           "XF86AudioNext" = "exec 'playerctl next'";
           "XF86AudioPrev" = "exec 'playerctl previous'";
         };
+        assigns = {
+          "9" = [{ class = "Spotify"; }];
+        };
         focus = {
           # Don't automatically focus hovered windows
           followMouse = "no";

overlays/default.nix

@@ -1,6 +1,5 @@
 { ... }: {
   imports = [
-    ./kanshi.nix
     ./ripgrep.nix
   ];
 }

overlays/kanshi.nix

@@ -1,14 +0,0 @@
-{ home-manager, home-manager-unstable, nixpkgs-unstable, ... }: {
-  # adaptiveSync requires the unstable kanshi nixpkgs and home-manager module
-
-  nixpkgs.overlays = [
-    (self: super: {
-      kanshi = nixpkgs-unstable.legacyPackages.${super.system}.kanshi;
-    })
-  ];
-
-  home-manager.users.caspervk = {
-    disabledModules = [ "${home-manager}/modules/services/kanshi.nix" ];
-    imports = [ "${home-manager-unstable}/modules/services/kanshi.nix" ];
-  };
-}