From 1ae77093cfe3f144138245aa45bfdf01a7d8242c Mon Sep 17 00:00:00 2001
From: "Casper V. Kristensen" <casper@vkristensen.dk>
Date: Sat, 26 Aug 2023 19:04:17 +0200
Subject: [PATCH] Remove kanshi

---
 hosts/omega/default.nix     |  1 +
 hosts/omega/sway.nix        | 18 ++++++++++++++++++
 hosts/zeta/default.nix      |  1 +
 hosts/zeta/sway.nix         | 14 ++++++++++++++
 modules/desktop/default.nix |  1 -
 modules/desktop/kanshi.nix  | 35 -----------------------------------
 modules/desktop/sway.nix    |  5 ++++-
 overlays/default.nix        |  1 -
 overlays/kanshi.nix         | 14 --------------
 9 files changed, 38 insertions(+), 52 deletions(-)
 create mode 100644 hosts/omega/sway.nix
 create mode 100644 hosts/zeta/sway.nix
 delete mode 100644 modules/desktop/kanshi.nix
 delete mode 100644 overlays/kanshi.nix

diff --git a/hosts/omega/default.nix b/hosts/omega/default.nix
index a32f86e..979485c 100644
--- a/hosts/omega/default.nix
+++ b/hosts/omega/default.nix
@@ -1,6 +1,7 @@
 { ... }: {
   imports = [
     ./hardware.nix
+    ./sway.nix
     ../../overlays
     ../../modules/base
     ../../modules/desktop
diff --git a/hosts/omega/sway.nix b/hosts/omega/sway.nix
new file mode 100644
index 0000000..b0a195b
--- /dev/null
+++ b/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";
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/hosts/zeta/default.nix b/hosts/zeta/default.nix
index 23437a5..a0ea71e 100644
--- a/hosts/zeta/default.nix
+++ b/hosts/zeta/default.nix
@@ -1,6 +1,7 @@
 { ... }: {
   imports = [
     ./hardware.nix
+    ./sway.nix
     ../../overlays
     ../../modules/base
     ../../modules/desktop
diff --git a/hosts/zeta/sway.nix b/hosts/zeta/sway.nix
new file mode 100644
index 0000000..368b604
--- /dev/null
+++ b/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";
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index c741ba8..aa3d371 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -3,7 +3,6 @@
     ./alacritty.nix
     ./clipman.nix
     ./gammastep.nix
-    ./kanshi.nix
     ./network.nix
     ./pipewire.nix
     ./programs.nix
diff --git a/modules/desktop/kanshi.nix b/modules/desktop/kanshi.nix
deleted file mode 100644
index 8efe4f3..0000000
--- a/modules/desktop/kanshi.nix
+++ /dev/null
@@ -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";
-          }
-        ];
-      };
-    };
-  };
-}
diff --git a/modules/desktop/sway.nix b/modules/desktop/sway.nix
index 17b7d1c..c334f43 100644
--- a/modules/desktop/sway.nix
+++ b/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";
diff --git a/overlays/default.nix b/overlays/default.nix
index 9e9de3c..3b841c4 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,6 +1,5 @@
 { ... }: {
   imports = [
-    ./kanshi.nix
     ./ripgrep.nix
   ];
 }
diff --git a/overlays/kanshi.nix b/overlays/kanshi.nix
deleted file mode 100644
index d5507b1..0000000
--- a/overlays/kanshi.nix
+++ /dev/null
@@ -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" ];
-  };
-}