greetd uwsm changes

This commit is contained in:
cnst
2024-11-25 19:16:07 +01:00
parent 13d2c4b482
commit fdd3f1c42b

View File

@@ -6,6 +6,7 @@
}: let }: let
inherit (lib) mkIf mkEnableOption mkMerge mkOption types; inherit (lib) mkIf mkEnableOption mkMerge mkOption types;
cfg = config.nixos.services.greetd; cfg = config.nixos.services.greetd;
host = config.networking.hostName;
in { in {
options = { options = {
nixos.services.greetd = { nixos.services.greetd = {
@@ -22,7 +23,8 @@ in {
}; };
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable (mkMerge [
{
services.greetd = let services.greetd = let
session = { session = {
command = "${lib.getExe config.programs.uwsm.package} start hyprland-uwsm.desktop"; command = "${lib.getExe config.programs.uwsm.package} start hyprland-uwsm.desktop";
@@ -36,17 +38,30 @@ in {
initial_session = session; initial_session = session;
}; };
}; };
}
(mkIf (host == "cnix") {
programs.uwsm = { programs.uwsm = {
enable = true; enable = true;
waylandCompositors.hyprland = { waylandCompositors.hyprland = {
binPath = "/run/current-system/sw/bin/Hyprland"; binPath = "/etc/profiles/per-user/cnst/bin/Hyprland";
prettyName = "Hyprland"; prettyName = "Hyprland";
comment = "Hyprland managed by UWSM"; comment = "Hyprland managed by UWSM";
}; };
}; };
})
(mkIf (host == "toothpc") {
programs.uwsm = {
enable = true;
waylandCompositors.hyprland = {
binPath = "/etc/profiles/per-user/toothpick/bin/Hyprland";
prettyName = "Hyprland";
comment = "Hyprland managed by UWSM";
};
};
})
# Apply GnomeKeyring PAM Service based on user configuration # Apply GnomeKeyring PAM Service based on user configuration
# security.pam.services.greetd.enableGnomeKeyring = cfg.gnomeKeyring.enable; # security.pam.services.greetd.enableGnomeKeyring = cfg.gnomeKeyring.enable;
}; ]);
} }