using mkMerge now
This commit is contained in:
@@ -56,14 +56,17 @@
|
||||
inputs.home-manager.nixosModules.default
|
||||
];
|
||||
nix.settings.trusted-users = [ "root" "@wheel" ];
|
||||
users.users.${config.user} = {
|
||||
users.users.${config.user} = lib.mkMerge [
|
||||
{
|
||||
isNormalUser = true;
|
||||
description = "John Lancaster";
|
||||
extraGroups = []
|
||||
++ lib.optionals config.root [ "wheel" ]
|
||||
++ lib.optionals config.docker [ "docker" ]
|
||||
++ lib.optionals config.networking.networkmanager.enable [ "networkmanager" ];
|
||||
} // userOptions config;
|
||||
}
|
||||
(userOptions config)
|
||||
];
|
||||
|
||||
users.users.root = lib.mkIf config.root (userOptions config);
|
||||
security.sudo-rs = lib.mkIf config.root {
|
||||
|
||||
Reference in New Issue
Block a user