nix/8.nix-darwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

users: allow shell to be managed by macOS

Browse source
This commit is contained in:
Michael Hoang 2024-10-25 01:16:19 +11:00
parent 3712ff78cc
commit dc6f754fe5
4 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/users/default.nix
View file

@ -242,7 +242,7 @@ in
"-GID" v.gid ]
++ (lib.optionals (v.description != null) [ "-fullName" v.description ])
++ (lib.optionals (v.home != null) [ "-home" v.home ])
++ [ "-shell" (shellPath v.shell) ])} 2> /dev/null
++ [ "-shell" (if v.shell != null then shellPath v.shell else "/usr/bin/false") ])} 2> /dev/null
# We need to check as `sysadminctl -addUser` still exits with exit code 0 when there's an error
if ! id ${name} &> /dev/null; then
@ -260,7 +260,7 @@ in
# Update properties on known users to keep them inline with configuration
dscl . -create ${dsclUser} PrimaryGroupID ${toString v.gid}
${optionalString (v.description != null) "dscl . -create ${dsclUser} RealName ${lib.escapeShellArg v.description}"}
dscl . -create ${dsclUser} UserShell ${lib.escapeShellArg (shellPath v.shell)}
${optionalString (v.shell != null) "dscl . -create ${dsclUser} UserShell ${lib.escapeShellArg (shellPath v.shell)}"}
fi
'') createdUsers}

13
modules/users/user.nix
View file

@ -73,10 +73,17 @@
};
shell = mkOption {
type = types.either types.shellPackage types.path;
default = "/usr/bin/false";
type = types.nullOr (types.either types.shellPackage types.path);
default = null;
example = literalExpression "pkgs.bashInteractive";
description = "The user's shell.";
description = ''
The user's shell. This defaults to `null`.
When this is set to `null`, if the user has not been created yet,
they will be created with the shell `/usr/bin/false` to prevent
interactive login. If the user already exists, the value is
considered managed by macOS and `nix-darwin` will not change it.
'';
};
packages = mkOption {