Fix user merging logic to preserve all fields from users.nix
Co-authored-by: Jyumpp <11142390+Jyumpp@users.noreply.github.com>
This commit is contained in:
@@ -169,11 +169,11 @@ in
|
|||||||
# External options take precedence over users.nix (which uses lib.mkDefault)
|
# External options take precedence over users.nix (which uses lib.mkDefault)
|
||||||
ugaif.users = lib.mapAttrs (
|
ugaif.users = lib.mapAttrs (
|
||||||
name: user:
|
name: user:
|
||||||
{
|
user
|
||||||
|
// {
|
||||||
description = lib.mkDefault (user.description or null);
|
description = lib.mkDefault (user.description or null);
|
||||||
shell = lib.mkDefault (user.shell or null);
|
shell = lib.mkDefault (user.shell or null);
|
||||||
extraGroups = lib.mkDefault (user.extraGroups or [ ]);
|
extraGroups = lib.mkDefault (user.extraGroups or [ ]);
|
||||||
external = user.external or null;
|
|
||||||
}
|
}
|
||||||
// (externalUserOptions.${name} or { })
|
// (externalUserOptions.${name} or { })
|
||||||
) accounts;
|
) accounts;
|
||||||
|
|||||||
Reference in New Issue
Block a user