From 9c15c93217717f7bfa9df50b347d99b9604ecc33 Mon Sep 17 00:00:00 2001
From: rocketcamel <luca_lise@icloud.com>
Date: Fri, 27 Jun 2025 15:40:29 -0700
Subject: [PATCH] fix: use gdm and uwsm, move monitor config to host-specific

---
 nix/hosts/kumatani/configuration.nix | 26 ++++++++++++++++++++
 nix/modules/desktop.nix              | 36 +++++++---------------------
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/nix/hosts/kumatani/configuration.nix b/nix/hosts/kumatani/configuration.nix
index dd9c600..ffa0137 100644
--- a/nix/hosts/kumatani/configuration.nix
+++ b/nix/hosts/kumatani/configuration.nix
@@ -45,6 +45,32 @@
   };
 
   desktop.enable = true;
+  home-manager.users.luca = {
+    services.kanshi = {
+      enable = true;
+      settings = [
+        {
+          profile.name = "main";
+          profile.outputs = [
+            {
+              criteria = "DP-1";
+              status = "enable";
+              scale = 1.0;
+              mode = "1920x1080";
+              position = "0,190";
+            }
+            {
+              criteria = "HDMI-A-1";
+              status = "enable";
+              scale = 1.0;
+              mode = "3440x1440";
+              position = "1920,0";
+            }
+          ];
+        }
+      ];
+    };
+  };
   kanata.enable = true;
   kanata.apple = true;
   users.users.luca = {
diff --git a/nix/modules/desktop.nix b/nix/modules/desktop.nix
index 666ac7f..ac5a651 100644
--- a/nix/modules/desktop.nix
+++ b/nix/modules/desktop.nix
@@ -39,9 +39,15 @@
       wdisplays
     ];
     programs.thunar.enable = true;
-    programs.hyprland.enable = true;
+    programs.hyprland = {
+      enable = true;
+      withUWSM = true;
+    };
     services.tumbler.enable = true;
-    services.displayManager.ly.enable = true;
+    services.displayManager.gdm = {
+      enable = true;
+      wayland = true;
+    };
     rofi.enable = true;
     services.upower.enable = true;
 
@@ -92,31 +98,6 @@
         enable = true;
         style.name = "adwaita-dark";
       };
-      services.kanshi = {
-        enable = true;
-        systemdTarget = "graphical-session.target";
-        settings = [
-          {
-            profile.name = "main";
-            profile.outputs = [
-              {
-                criteria = "DP-1";
-                status = "enable";
-                scale = 1.0;
-                mode = "1920x1080";
-                position = "0,190";
-              }
-              {
-                criteria = "HDMI-A-1";
-                status = "enable";
-                scale = 1.0;
-                mode = "3440x1440";
-                position = "1920,0";
-              }
-            ];
-          }
-        ];
-      };
 
       wayland.windowManager.hyprland = {
         enable = true;
@@ -188,7 +169,6 @@
           exec-once = [
             "status-bar"
             "wl-clip-persist --clipboard regular"
-            "sleep 4 && kanshi"
           ];
           monitor = [
             "eDP-1, 1920x1080, 0x0, 1"