From cacf23142ce61911c718074d4a56a881879bce8a Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Wed, 4 Oct 2023 01:33:04 -0400
Subject: [PATCH] Switch to tuigreet

---
 module/default.nix | 15 ++++++++-------
 test/default.nix   |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/module/default.nix b/module/default.nix
index 62a3d4b..bf47ffe 100644
--- a/module/default.nix
+++ b/module/default.nix
@@ -282,14 +282,15 @@ in
       };
     };
 
-    services.greetd.enable = true;
-
-    programs.regreet = {
+    services.greetd = {
       enable = true;
-      settings = lib.mkIf cfg.ocrOptimizations {
-        GTK = {
-          font_name = "Inconsolata 16";
-          application_prefer_dark_theme = true;
+      settings = {
+        default_session = {
+          # Dont want to have to specifically --sessions want it to use default sessions dir XDG_DATA_DIRS/share/{xsessions, wayland-sessions}
+          # tuigreet does not check XDG_DATA_DIRS for sessions it checks /usr/share/wayland-sessions
+          # tuigreet stores last logined in users into /var/cache/ !!! ARGGG!!! Again!!! First regreet now this argggg!
+          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --user-menu --remember --remember-user-session"
+            + " --sessions ${cfg.services.xserver.displayManager.sessionData.desktops}/share/wayland-sessions";
         };
       };
     };
diff --git a/test/default.nix b/test/default.nix
index ecb35b0..bf41e31 100644
--- a/test/default.nix
+++ b/test/default.nix
@@ -48,7 +48,7 @@ nixos-lib.runTest {
       testScript = ''
         machine.start()
         machine.wait_for_unit("greetd")
-        machine.wait_for_text("Welcome back!")
+        machine.wait_for_text("Authenticate into machine")
       '';
     }
   ];