diff --git a/flake.nix b/flake.nix index f99973b..1c42b8d 100644 --- a/flake.nix +++ b/flake.nix @@ -56,14 +56,17 @@ inputs.home-manager.nixosModules.default ]; nix.settings.trusted-users = [ "root" "@wheel" ]; - users.users.${config.user} = { - 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; + 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) + ]; users.users.root = lib.mkIf config.root (userOptions config); security.sudo-rs = lib.mkIf config.root {