cosmic-greeter: add cosmic-randr to PATH; nixos/cosmic-greeter: install cosmic-comp by default (#448844)
This commit is contained in:
@@ -24,6 +24,11 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [
|
||||
pkgs.cosmic-comp
|
||||
cfg.package
|
||||
];
|
||||
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
@@ -50,14 +55,22 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
systemd.tmpfiles.settings.cosmic-greeter."/run/cosmic-greeter".d = {
|
||||
group = "cosmic-greeter";
|
||||
mode = "0755";
|
||||
user = "cosmic-greeter";
|
||||
};
|
||||
|
||||
# The greeter user is hardcoded in `cosmic-greeter`
|
||||
users.groups.cosmic-greeter = { };
|
||||
users.users.cosmic-greeter = {
|
||||
description = "COSMIC login greeter user";
|
||||
isSystemUser = true;
|
||||
home = "/var/lib/cosmic-greeter";
|
||||
homeMode = "0750";
|
||||
createHome = true;
|
||||
group = "cosmic-greeter";
|
||||
extraGroups = [ "video" ];
|
||||
};
|
||||
# Required for authentication
|
||||
security.pam.services.cosmic-greeter = { };
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
xkeyboard_config,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
orca,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -47,6 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
libinput
|
||||
linux-pam
|
||||
udev
|
||||
orca
|
||||
];
|
||||
|
||||
dontUseJustBuild = true;
|
||||
@@ -63,10 +65,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/greeter.rs --replace-fail '/usr/bin/env' '${lib.getExe' coreutils "env"}'
|
||||
substituteInPlace src/greeter.rs --replace-fail '/usr/bin/orca' '${lib.getExe orca}'
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
libcosmicAppWrapperArgs+=(
|
||||
--prefix PATH : ${lib.makeBinPath [ cosmic-randr ]}
|
||||
--set-default X11_BASE_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/base.xml
|
||||
--set-default X11_BASE_EXTRA_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/extra.xml
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user