treewide: move regreet styling out of module
This commit is contained in:
parent
6fef9e0a76
commit
57432a9655
2 changed files with 23 additions and 26 deletions
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
inputs,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
# thanks https://git.jacekpoz.pl/poz/niksos/src/commit/f8d5e7ccd9c769f7c0b564f10dff419285e75248/modules/services/greetd.nix
|
||||
|
@ -10,6 +10,8 @@ let
|
|||
inherit (lib) getExe getExe';
|
||||
inherit (inputs.hyprland.packages.${pkgs.stdenv.system}) hyprland;
|
||||
|
||||
styleCfg = config.local.style;
|
||||
|
||||
hyprctl = getExe' hyprland "hyprctl";
|
||||
Hyprland = getExe' hyprland "Hyprland";
|
||||
|
||||
|
@ -46,9 +48,25 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
programs.regreet = {
|
||||
enable = true;
|
||||
};
|
||||
programs.regreet = lib.mkMerge [
|
||||
{
|
||||
enable = true;
|
||||
}
|
||||
|
||||
(lib.mkIf styleCfg.enable {
|
||||
theme = {
|
||||
inherit (styleCfg.gtk.theme) name package;
|
||||
};
|
||||
|
||||
cursorTheme = {
|
||||
inherit (styleCfg.cursorTheme) name package;
|
||||
};
|
||||
|
||||
iconTheme = {
|
||||
inherit (styleCfg.gtk.iconTheme) name package;
|
||||
};
|
||||
})
|
||||
];
|
||||
|
||||
security.pam.services = {
|
||||
greetd.enableGnomeKeyring = true;
|
||||
|
|
|
@ -1,21 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
cfg = config.local.style;
|
||||
in {
|
||||
config.programs.regreet = lib.mkIf cfg.enable {
|
||||
theme = {
|
||||
inherit (cfg.gtk.theme) name package;
|
||||
};
|
||||
|
||||
cursorTheme = {
|
||||
inherit (cfg.cursorTheme) name package;
|
||||
};
|
||||
|
||||
iconTheme = {
|
||||
inherit (cfg.gtk.iconTheme) name package;
|
||||
};
|
||||
};
|
||||
}
|
Loading…
Reference in a new issue