using mkMerge now

This commit is contained in:
John Lancaster
2025-07-06 23:54:22 -05:00
parent cc21dcdc92
commit 92067f8b69

View File

@@ -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 {