From fbec76baa7d1e3c85155afb9c99730ade769b4d1 Mon Sep 17 00:00:00 2001
From: Bun <bun@nixfox.ca>
Date: Tue, 6 May 2025 08:23:30 -0400
Subject: [PATCH] Switch to greetd to fix the service crisis

---
 hosts/jupiter/jovian/default.nix                 |  1 -
 hosts/redmond/default.nix                        |  2 +-
 modules/home/user/default.nix                    |  2 --
 modules/home/wms/programs/clipman/default.nix    |  4 ++++
 modules/home/wms/programs/default.nix            |  5 ++---
 modules/home/wms/programs/wlsunset/default.nix   |  8 ++++++++
 modules/home/wms/sway/autostart/default.nix      |  6 ------
 modules/system/programs/desktops/default.nix     |  6 ++++--
 .../services/general/displaymanager/default.nix  | 16 ++++++++++++----
 9 files changed, 31 insertions(+), 19 deletions(-)
 create mode 100644 modules/home/wms/programs/clipman/default.nix
 create mode 100644 modules/home/wms/programs/wlsunset/default.nix

diff --git a/hosts/jupiter/jovian/default.nix b/hosts/jupiter/jovian/default.nix
index 972b9eb4..fa5ecf0c 100644
--- a/hosts/jupiter/jovian/default.nix
+++ b/hosts/jupiter/jovian/default.nix
@@ -31,7 +31,6 @@
     };
 
     services = {
-      displayManager.ly.enable = lib.mkForce false;
       keyd.enable = lib.mkForce false;
       tlp.enable = lib.mkForce false;
       xserver.desktopManager.gnome.enable = true;
diff --git a/hosts/redmond/default.nix b/hosts/redmond/default.nix
index a07d29c8..1979372d 100644
--- a/hosts/redmond/default.nix
+++ b/hosts/redmond/default.nix
@@ -17,5 +17,5 @@
     stateVersion = "24.05";
   };
 
-  environment.sessionVariables.WLR_RENDERER = lib.mkForce "gles2";
+  programs.sway.extraSessionCommands = lib.mkForce "WLR_RENDERER=gles2";
 }
diff --git a/modules/home/user/default.nix b/modules/home/user/default.nix
index 4d354939..8ca14e0c 100644
--- a/modules/home/user/default.nix
+++ b/modules/home/user/default.nix
@@ -4,11 +4,9 @@
     username = "bun";
     homeDirectory = "/home/${config.home.username}";
     sessionVariables = {
-      ELECTRON_OZONE_PLATFORM_HINT = "auto";
       LIBVIRT_DEFAULT_URI = "qemu:///system";
       MANPAGER = "nvim +Man!";
       NIXPKGS_ALLOW_UNFREE = 1;
-      ZSH_DISABLE_COMPFIX = "true";
     };
   };
 }
diff --git a/modules/home/wms/programs/clipman/default.nix b/modules/home/wms/programs/clipman/default.nix
new file mode 100644
index 00000000..f9f718a2
--- /dev/null
+++ b/modules/home/wms/programs/clipman/default.nix
@@ -0,0 +1,4 @@
+{ config, ... }:
+{
+  services.clipman.enable = config.home.desktop.enable;
+}
diff --git a/modules/home/wms/programs/default.nix b/modules/home/wms/programs/default.nix
index a3e86a78..9a534607 100644
--- a/modules/home/wms/programs/default.nix
+++ b/modules/home/wms/programs/default.nix
@@ -1,22 +1,21 @@
 { config, lib, pkgs, ... }:
 {
   imports = [
+    ./clipman
     ./kanshi
     ./mako
     ./rofi
     ./swaylock
     ./waybar
+    ./wlsunset
   ];
 
   home.packages = with pkgs; lib.mkIf config.home.desktop.enable [
     brightnessctl
-    clipman
     hyprpicker
     libnotify
     rot8
     shotman
     wdisplays
-    wl-clipboard
-    wlsunset
   ];
 }
diff --git a/modules/home/wms/programs/wlsunset/default.nix b/modules/home/wms/programs/wlsunset/default.nix
new file mode 100644
index 00000000..fe83e032
--- /dev/null
+++ b/modules/home/wms/programs/wlsunset/default.nix
@@ -0,0 +1,8 @@
+{ config, ... }:
+{
+  services.wlsunset = {
+    enable = config.home.desktop.enable;
+    sunrise = "07:30";
+    sunset = "22:30";
+  };
+}
diff --git a/modules/home/wms/sway/autostart/default.nix b/modules/home/wms/sway/autostart/default.nix
index aabda2c2..de2171d9 100644
--- a/modules/home/wms/sway/autostart/default.nix
+++ b/modules/home/wms/sway/autostart/default.nix
@@ -10,13 +10,7 @@
       { command = "foot -a sound -T Sound pulsemixer"; }
 
       # Daemons and tray
-      { command = "kanshi"; }
-      { command = "mako"; }
       { command = "rot8"; }
-      { command = "wl-copy"; }
-      { command = "wl-paste -t text --watch clipman store -P"; }
-      { command = "wlsunset -s 22:30 -S 07:30"; }
-      { command = "wpaperd"; }
 
       # Foreground
       { command = "thunderbird"; }
diff --git a/modules/system/programs/desktops/default.nix b/modules/system/programs/desktops/default.nix
index 6c05c96c..3502454e 100644
--- a/modules/system/programs/desktops/default.nix
+++ b/modules/system/programs/desktops/default.nix
@@ -4,11 +4,13 @@
     programs.sway = {
       enable = true;
       extraOptions = [ "--unsupported-gpu" ];
+      extraSessionCommands = ''
+        export ELECTRON_OZONE_PLATFORM_HINT=wayland
+        export WLR_RENDERER=vulkan
+      '';
       wrapperFeatures.gtk = true;
     };
 
-    environment.sessionVariables.WLR_RENDERER = "vulkan";
-
     services.dbus.enable = true;
     security.pam.services.swaylock = {};
   };
diff --git a/modules/system/services/general/displaymanager/default.nix b/modules/system/services/general/displaymanager/default.nix
index 4fd93baf..3b416d03 100644
--- a/modules/system/services/general/displaymanager/default.nix
+++ b/modules/system/services/general/displaymanager/default.nix
@@ -1,10 +1,18 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 {
   config = lib.mkIf config.system.desktop.enable {
-    services.displayManager.ly = {
+    services.greetd = {
       enable = true;
-      settings.vi_mode = true;
+      settings.default_session.command = lib.mkDefault (lib.strings.concatStringsSep " " [ 
+        "${pkgs.greetd.tuigreet}/bin/tuigreet"
+        "--asterisks"
+        "--remember"
+        "--remember-user-session"
+        "--time"
+        "--user-menu"
+      ]);
+      vt = 2;
     };
-    environment.persistence."/persist".files = [ "/etc/ly/save.ini" ];
+    environment.persistence."/persist".files = [ "/var/cache/tuigreet" ];
   };
 }