From ced4a28e9b0f5b9af9f1d0c5b311e5bc4c15f1ea Mon Sep 17 00:00:00 2001
From: moons14 <moons@moons14.com>
Date: Thu, 30 Oct 2025 04:52:57 +0900
Subject: [PATCH] regreet

---
 modules/core/greetd.nix         | 12 ------------
 modules/core/greetd/config.ron  |  6 ++++++
 modules/core/greetd/default.nix | 19 +++++++++++++++++++
 profiles/gui.nix                |  2 +-
 4 files changed, 26 insertions(+), 13 deletions(-)
 delete mode 100644 modules/core/greetd.nix
 create mode 100644 modules/core/greetd/config.ron
 create mode 100644 modules/core/greetd/default.nix

diff --git a/modules/core/greetd.nix b/modules/core/greetd.nix
deleted file mode 100644
index af03b63..0000000
--- a/modules/core/greetd.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, username, ... }: {
-  services.greetd = {
-    enable = true;
-    vt = 3;
-    settings = {
-      default_session = {
-        user = "greeter";
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --cmd niri-session";
-      };
-    };
-  };
-}
diff --git a/modules/core/greetd/config.ron b/modules/core/greetd/config.ron
new file mode 100644
index 0000000..516d8dd
--- /dev/null
+++ b/modules/core/greetd/config.ron
@@ -0,0 +1,6 @@
+Config(
+  default_session: Some("niri-session"),
+  remember_username: true,
+  twenty_four_hour_clock: true,
+  # font_family: Some("BlexMono Nerd Font Mono"),
+)
\ No newline at end of file
diff --git a/modules/core/greetd/default.nix b/modules/core/greetd/default.nix
new file mode 100644
index 0000000..2290751
--- /dev/null
+++ b/modules/core/greetd/default.nix
@@ -0,0 +1,19 @@
+{ pkgs, username, ... }: {
+  environment.systemPackages = with pkgs; [
+    regreet
+    cage
+  ];
+
+  services.greetd = {
+    enable = true;
+    vt = 3;
+    settings = {
+      default_session = {
+        user = "greeter";
+        command = "${pkgs.cage}/bin/cage -s -- ${pkgs.regreet}/bin/regreet --time --remember --cmd niri-session";
+      };
+    };
+  };
+
+  environment.etc."regreet/config.ron".source = ./config.ron;
+}
diff --git a/profiles/gui.nix b/profiles/gui.nix
index f3ef404..6e8f8ea 100644
--- a/profiles/gui.nix
+++ b/profiles/gui.nix
@@ -4,7 +4,7 @@
     ./cli.nix
     ./../modules/core/niri.nix
     ./../modules/core/hyprland.nix
-    ./../modules/core/greetd.nix
+    ./../modules/core/greetd
     ./../modules/core/noctalia.nix
   ];