nixos/services/greetd: switch back to gtkgreet, conditionally toggle compositors in greetd/environments
This commit is contained in:
parent
10d313f33a
commit
210ed38295
1 changed files with 16 additions and 5 deletions
|
@ -13,11 +13,9 @@ let
|
||||||
hyprctl = getExe' hyprland "hyprctl";
|
hyprctl = getExe' hyprland "hyprctl";
|
||||||
Hyprland = getExe' hyprland "Hyprland";
|
Hyprland = getExe' hyprland "Hyprland";
|
||||||
|
|
||||||
greeter = getExe config.programs.regreet.package;
|
greeter = getExe pkgs.greetd.gtkgreet;
|
||||||
|
|
||||||
hyprlandConfig = let
|
hyprlandConfig =
|
||||||
cfg = config.local.style;
|
|
||||||
in
|
|
||||||
pkgs.writeText "greetd-hyprland-config"
|
pkgs.writeText "greetd-hyprland-config"
|
||||||
''
|
''
|
||||||
misc {
|
misc {
|
||||||
|
@ -32,7 +30,7 @@ let
|
||||||
|
|
||||||
workspace=1,default:true,gapsout:0,gapsin:0,border:false,decorate:false
|
workspace=1,default:true,gapsout:0,gapsin:0,border:false,decorate:false
|
||||||
|
|
||||||
exec-once=[workspace 1;fullscreen;noanim] ${greeter}; ${hyprctl} dispatch exit
|
exec-once=[workspace 1;fullscreen;noanim] ${greeter} -l; ${hyprctl} dispatch exit
|
||||||
exec-once=${hyprctl} dispatch focuswindow ${greeter}
|
exec-once=${hyprctl} dispatch focuswindow ${greeter}
|
||||||
'';
|
'';
|
||||||
in {
|
in {
|
||||||
|
@ -56,4 +54,17 @@ in {
|
||||||
gdm-password.enableGnomeKeyring = true;
|
gdm-password.enableGnomeKeyring = true;
|
||||||
greetd.fprintAuth = false;
|
greetd.fprintAuth = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
environment.etc."greetd/environments".text = lib.strings.concatStringsSep "\n" [
|
||||||
|
(lib.optionalString
|
||||||
|
config.programs.hyprland.enable
|
||||||
|
(
|
||||||
|
if config.programs.hyprland.withUWSM
|
||||||
|
then "uwsm start -S hyprland-uwsm.desktop"
|
||||||
|
else "Hyprland"
|
||||||
|
))
|
||||||
|
(lib.optionalString
|
||||||
|
config.programs.sway.enable
|
||||||
|
"sway")
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue