From ced4a28e9b0f5b9af9f1d0c5b311e5bc4c15f1ea Mon Sep 17 00:00:00 2001 From: moons14 Date: Thu, 30 Oct 2025 04:52:57 +0900 Subject: [PATCH 01/10] 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 ]; From d29927d471254c9f73c990c1eb7b967ee1ae4baa Mon Sep 17 00:00:00 2001 From: moons14 Date: Thu, 30 Oct 2025 05:20:49 +0900 Subject: [PATCH 02/10] regreet --- modules/core/fingerprint.nix | 3 --- modules/core/greetd/default.nix | 12 +++++++----- modules/core/greetd/niri.kdl | 10 ++++++++++ 3 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 modules/core/greetd/niri.kdl diff --git a/modules/core/fingerprint.nix b/modules/core/fingerprint.nix index d76a32f..10f0ea6 100644 --- a/modules/core/fingerprint.nix +++ b/modules/core/fingerprint.nix @@ -17,8 +17,5 @@ # greetd (tuigreet / ReGreet) greetd.fprintAuth = true; - - # lock screen - swaylock.fprintAuth = true; }; } \ No newline at end of file diff --git a/modules/core/greetd/default.nix b/modules/core/greetd/default.nix index 2290751..f31c3b8 100644 --- a/modules/core/greetd/default.nix +++ b/modules/core/greetd/default.nix @@ -1,8 +1,9 @@ { pkgs, username, ... }: { - environment.systemPackages = with pkgs; [ - regreet - cage - ]; + programs.regreet.enable = true; + programs.niri.enable = true; + + environment.etc."regreet/config.ron".source = ./config.ron; + environment.etc."greetd/niri.kdl".source = ./niri.kdl; services.greetd = { enable = true; @@ -10,10 +11,11 @@ settings = { default_session = { user = "greeter"; - command = "${pkgs.cage}/bin/cage -s -- ${pkgs.regreet}/bin/regreet --time --remember --cmd niri-session"; + command = "${pkgs.niri}/bin/niri --config /etc/greetd/niri.kdl"; }; }; }; + programs.regreet.enable = true; environment.etc."regreet/config.ron".source = ./config.ron; } diff --git a/modules/core/greetd/niri.kdl b/modules/core/greetd/niri.kdl new file mode 100644 index 0000000..6ea5729 --- /dev/null +++ b/modules/core/greetd/niri.kdl @@ -0,0 +1,10 @@ +spawn-sh-at-startup "regreet; niri msg action quit --skip-confirmation" + +hotkey-overlay { + skip-at-startup +} + +cursor { + xcursor-theme "catppuccin-mocha-red-cursors" + xcursor-size 24 +} \ No newline at end of file From 2666b0cadc86c3f7ba9b44fd75a2f7b6b84ed9b6 Mon Sep 17 00:00:00 2001 From: moons14 Date: Thu, 30 Oct 2025 05:24:50 +0900 Subject: [PATCH 03/10] fix error --- modules/core/greetd/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/core/greetd/default.nix b/modules/core/greetd/default.nix index f31c3b8..f33d033 100644 --- a/modules/core/greetd/default.nix +++ b/modules/core/greetd/default.nix @@ -15,7 +15,6 @@ }; }; }; - programs.regreet.enable = true; environment.etc."regreet/config.ron".source = ./config.ron; } From 955f6693cacdb864642be35f6aea13de186d4170 Mon Sep 17 00:00:00 2001 From: moons14 Date: Thu, 30 Oct 2025 05:25:16 +0900 Subject: [PATCH 04/10] fix error --- modules/core/greetd/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/core/greetd/default.nix b/modules/core/greetd/default.nix index f33d033..80dec71 100644 --- a/modules/core/greetd/default.nix +++ b/modules/core/greetd/default.nix @@ -15,6 +15,4 @@ }; }; }; - - environment.etc."regreet/config.ron".source = ./config.ron; } From 16d56b65524f9795fb4899bd165f12e7a787575b Mon Sep 17 00:00:00 2001 From: moons14 Date: Thu, 30 Oct 2025 05:35:31 +0900 Subject: [PATCH 05/10] cage --- modules/core/greetd/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/core/greetd/default.nix b/modules/core/greetd/default.nix index 80dec71..1156bc9 100644 --- a/modules/core/greetd/default.nix +++ b/modules/core/greetd/default.nix @@ -1,9 +1,8 @@ { pkgs, username, ... }: { programs.regreet.enable = true; - programs.niri.enable = true; + services.cage.enable = true; environment.etc."regreet/config.ron".source = ./config.ron; - environment.etc."greetd/niri.kdl".source = ./niri.kdl; services.greetd = { enable = true; @@ -11,7 +10,7 @@ settings = { default_session = { user = "greeter"; - command = "${pkgs.niri}/bin/niri --config /etc/greetd/niri.kdl"; + command = "cage -s -mlast -- regreet"; }; }; }; From 0d622905b06d622496c2627b1f3620328e3ca2a4 Mon Sep 17 00:00:00 2001 From: moons14 Date: Thu, 30 Oct 2025 05:35:43 +0900 Subject: [PATCH 06/10] rm niri --- modules/core/greetd/niri.kdl | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 modules/core/greetd/niri.kdl diff --git a/modules/core/greetd/niri.kdl b/modules/core/greetd/niri.kdl deleted file mode 100644 index 6ea5729..0000000 --- a/modules/core/greetd/niri.kdl +++ /dev/null @@ -1,10 +0,0 @@ -spawn-sh-at-startup "regreet; niri msg action quit --skip-confirmation" - -hotkey-overlay { - skip-at-startup -} - -cursor { - xcursor-theme "catppuccin-mocha-red-cursors" - xcursor-size 24 -} \ No newline at end of file From f13dbc4b1d50875e7b3a431eb400dac9dbc2ecb3 Mon Sep 17 00:00:00 2001 From: moons14 Date: Thu, 30 Oct 2025 05:38:15 +0900 Subject: [PATCH 07/10] greeter user --- modules/core/greetd/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/core/greetd/default.nix b/modules/core/greetd/default.nix index 1156bc9..ca3b896 100644 --- a/modules/core/greetd/default.nix +++ b/modules/core/greetd/default.nix @@ -14,4 +14,11 @@ }; }; }; + + users.users.greeter = { + isSystemUser = true; + group = "greeter"; + extraGroups = [ "input" "video" ]; + }; + users.groups.greeter = {}; } From 86d504caa8134d9ece22b1b6f83213449a77c94e Mon Sep 17 00:00:00 2001 From: moons14 Date: Thu, 30 Oct 2025 05:44:25 +0900 Subject: [PATCH 08/10] fix greetd --- modules/core/greetd/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/modules/core/greetd/default.nix b/modules/core/greetd/default.nix index ca3b896..575e6a1 100644 --- a/modules/core/greetd/default.nix +++ b/modules/core/greetd/default.nix @@ -1,6 +1,6 @@ -{ pkgs, username, ... }: { +{ pkgs, ... }: { programs.regreet.enable = true; - services.cage.enable = true; + environment.systemPackages = with pkgs; [ cage ]; environment.etc."regreet/config.ron".source = ./config.ron; @@ -10,15 +10,8 @@ settings = { default_session = { user = "greeter"; - command = "cage -s -mlast -- regreet"; + command = "${pkgs.cage}/bin/cage -s -mlast -- regreet --config /etc/regreet/config.ron"; }; }; }; - - users.users.greeter = { - isSystemUser = true; - group = "greeter"; - extraGroups = [ "input" "video" ]; - }; - users.groups.greeter = {}; } From bd3131d646951fbf5b3b0f736ce6642b7ae0caa9 Mon Sep 17 00:00:00 2001 From: moons14 Date: Thu, 30 Oct 2025 05:50:06 +0900 Subject: [PATCH 09/10] fix path --- modules/core/greetd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/greetd/default.nix b/modules/core/greetd/default.nix index 575e6a1..736855d 100644 --- a/modules/core/greetd/default.nix +++ b/modules/core/greetd/default.nix @@ -10,7 +10,7 @@ settings = { default_session = { user = "greeter"; - command = "${pkgs.cage}/bin/cage -s -mlast -- regreet --config /etc/regreet/config.ron"; + command = "${pkgs.cage}/bin/cage -s -mlast -- /run/current-system/sw/bin/regreet --config /etc/regreet/config.ron"; }; }; }; From f084ca3b947d28846cb5991e8a8373c0ffe0a2d6 Mon Sep 17 00:00:00 2001 From: moons14 Date: Thu, 30 Oct 2025 05:57:45 +0900 Subject: [PATCH 10/10] fix --- modules/core/greetd/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/core/greetd/default.nix b/modules/core/greetd/default.nix index 736855d..e523aed 100644 --- a/modules/core/greetd/default.nix +++ b/modules/core/greetd/default.nix @@ -14,4 +14,11 @@ }; }; }; + + users.users.greeter = { + isSystemUser = true; + group = "greeter"; + extraGroups = [ "input" "video" ]; + }; + users.groups.greeter = {}; }