From cdfcbf751d1a27d5e92719921596d6a05641d87f Mon Sep 17 00:00:00 2001 From: MathewHDYT <48954742+MathewHDYT@users.noreply.github.com> Date: Fri, 8 Nov 2024 11:37:56 +0100 Subject: [PATCH 1/6] Attempt to add regrett configuration --- modules/programs/greetd.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/programs/greetd.nix b/modules/programs/greetd.nix index 5a3f598..dc4f958 100644 --- a/modules/programs/greetd.nix +++ b/modules/programs/greetd.nix @@ -58,6 +58,16 @@ ''; }; }; + regreet = { + customSettings = lib.mkOption { + default = { }; + example = { }; + type = with lib.types; attrsOf anything; + description = '' + Custom regret settings. + ''; + }; + }; }; config = @@ -91,6 +101,9 @@ default_session = session; }; }; + programs.regreet.enable = true; + programs.regreet.settings = config.mods.regreet.customSettings; + environment.etc."greetd/environments".text = config.mods.greetd.environments; -- 2.51.2 From 0628fa1eeb5bd09766529154061efafeb72d3bef Mon Sep 17 00:00:00 2001 From: MathewHDYT <48954742+MathewHDYT@users.noreply.github.com> Date: Fri, 8 Nov 2024 13:20:46 +0100 Subject: [PATCH 2/6] Prevent double install of regreet --- modules/conf.nix | 2 +- modules/programs/browser/firefox.nix | 2 +- modules/programs/greetd.nix | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/conf.nix b/modules/conf.nix index cb92f2b..2c3236f 100644 --- a/modules/conf.nix +++ b/modules/conf.nix @@ -88,7 +88,7 @@ ]; type = with lib.types; listOf attrs; description = '' - Adds modules to ironbar. + Adds modules to ironbar. See https://github.com/JakeStanger/ironbar/wiki/ for more information. ''; }; }; diff --git a/modules/programs/browser/firefox.nix b/modules/programs/browser/firefox.nix index 108ce1c..9452a07 100644 --- a/modules/programs/browser/firefox.nix +++ b/modules/programs/browser/firefox.nix @@ -46,7 +46,7 @@ }; example = { }; type = with lib.types; attrsOf anything; - description = "Firefox policy configuration"; + description = "Firefox policy configuration. See https://mozilla.github.io/policy-templates/ for more information."; }; extensions = lib.mkOption { default = with pkgs.nur.repos.rycee.firefox-addons; [ diff --git a/modules/programs/greetd.nix b/modules/programs/greetd.nix index dc4f958..25fa4a6 100644 --- a/modules/programs/greetd.nix +++ b/modules/programs/greetd.nix @@ -64,7 +64,7 @@ example = { }; type = with lib.types; attrsOf anything; description = '' - Custom regret settings. + Custom regret settings. See https://github.com/rharish101/ReGreet/blob/main/regreet.sample.toml for more information. ''; }; }; @@ -101,9 +101,10 @@ default_session = session; }; }; - programs.regreet.enable = true; - programs.regreet.settings = config.mods.regreet.customSettings; - + + programs.regreet = { + settings = config.mods.regreet.customSettings; + }; environment.etc."greetd/environments".text = config.mods.greetd.environments; -- 2.51.2 From 1a20bb8155af8006745a02aa6d9911d7eb9b3d69 Mon Sep 17 00:00:00 2001 From: MathewHDYT <48954742+MathewHDYT@users.noreply.github.com> Date: Fri, 8 Nov 2024 13:23:13 +0100 Subject: [PATCH 3/6] Install regreet over program enable --- modules/programs/greetd.nix | 1 + modules/programs/homePackages.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/programs/greetd.nix b/modules/programs/greetd.nix index 25fa4a6..2705e94 100644 --- a/modules/programs/greetd.nix +++ b/modules/programs/greetd.nix @@ -103,6 +103,7 @@ }; programs.regreet = { + enable = true; settings = config.mods.regreet.customSettings; }; diff --git a/modules/programs/homePackages.nix b/modules/programs/homePackages.nix index a887f47..07225ba 100644 --- a/modules/programs/homePackages.nix +++ b/modules/programs/homePackages.nix @@ -106,7 +106,6 @@ flake-checker gnome-keyring gnutar - greetd.regreet killall kitty libnotify -- 2.51.2 From 67f3f48ae4ef2b44791712e97ce0dc8373b40d0c Mon Sep 17 00:00:00 2001 From: MathewHDYT <48954742+MathewHDYT@users.noreply.github.com> Date: Fri, 8 Nov 2024 14:17:07 +0100 Subject: [PATCH 4/6] Force regreet settings --- modules/programs/greetd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/programs/greetd.nix b/modules/programs/greetd.nix index 2705e94..8049a72 100644 --- a/modules/programs/greetd.nix +++ b/modules/programs/greetd.nix @@ -104,7 +104,7 @@ programs.regreet = { enable = true; - settings = config.mods.regreet.customSettings; + settings = lib.mkForce config.mods.regreet.customSettings; }; environment.etc."greetd/environments".text = config.mods.greetd.environments; -- 2.51.2 From 5a13d4cb74a094a77abbaea40a4e77df192a44da Mon Sep 17 00:00:00 2001 From: MathewHDYT <48954742+MathewHDYT@users.noreply.github.com> Date: Fri, 8 Nov 2024 16:26:49 +0100 Subject: [PATCH 5/6] Revert regreet over programs enable. --- modules/programs/greetd.nix | 1 - modules/programs/homePackages.nix | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/programs/greetd.nix b/modules/programs/greetd.nix index 8049a72..4286211 100644 --- a/modules/programs/greetd.nix +++ b/modules/programs/greetd.nix @@ -103,7 +103,6 @@ }; programs.regreet = { - enable = true; settings = lib.mkForce config.mods.regreet.customSettings; }; diff --git a/modules/programs/homePackages.nix b/modules/programs/homePackages.nix index 07225ba..a887f47 100644 --- a/modules/programs/homePackages.nix +++ b/modules/programs/homePackages.nix @@ -106,6 +106,7 @@ flake-checker gnome-keyring gnutar + greetd.regreet killall kitty libnotify -- 2.51.2 From bc2f5767aa37c0cb57b83b77c371623e4e93e5f6 Mon Sep 17 00:00:00 2001 From: MathewHDYT <48954742+MathewHDYT@users.noreply.github.com> Date: Fri, 8 Nov 2024 18:59:05 +0100 Subject: [PATCH 6/6] Move regreet config into homemanger. --- modules/programs/greetd.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/programs/greetd.nix b/modules/programs/greetd.nix index 4286211..075b575 100644 --- a/modules/programs/greetd.nix +++ b/modules/programs/greetd.nix @@ -102,10 +102,6 @@ }; }; - programs.regreet = { - settings = lib.mkForce config.mods.regreet.customSettings; - }; - environment.etc."greetd/environments".text = config.mods.greetd.environments; # should technically be the same, but this is configured instead in order to provide a decent out of the box login experience. @@ -134,11 +130,13 @@ env=XCURSOR_SIZE,${toString config.mods.stylix.cursor.size} env=QT_QPA_PLATFORMTHEME,qt5ct - exec-once=regreet --style /home/${username}/.config/gtk-3.0/gtk.css; hyprctl dispatch exit + exec-once=regreet --style /home/${username}/.config/gtk-3.0/gtk.css --config /home/${username}/.config/regreet/regreet.toml; hyprctl dispatch exit ''; # unlock GPG keyring on login security.pam.services.greetd.enableGnomeKeyring = true; + } // lib.optionalAttrs (options ? home) { + xdg.configFile."regreet/regreet.toml".source = (pkgs.formats.toml { }).generate "regreet" config.mods.regreet.customSettings; } ); } -- 2.51.2