diff --git a/common/users/cameron/default.nix b/common/users/cameron/default.nix index 6819a64..d6a83af 100644 --- a/common/users/cameron/default.nix +++ b/common/users/cameron/default.nix @@ -5,7 +5,7 @@ with lib; let in { options.user.cameron = { enable = mkEnableOption "user cameron"; - } + }; config = mkIf cfg.enable { users = { @@ -17,7 +17,8 @@ in { uid = 1000; group = "cameron"; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = [ "wheel" ] ++ + (lib.optionals config.networking.networkmanager.enable [ "networkmanager" ]); home = "/home/cameron-nix"; createHome = true; diff --git a/flake.nix b/flake.nix index a9fb497..0fd430f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,4 @@ { - description = "My nixos config as a flake"; @@ -8,7 +7,7 @@ }; - outputs = { self, nixpkgs }@inputs: + outputs = { self, nixpkgs }@inputs: let lib = nixpkgs.lib; in { @@ -18,11 +17,10 @@ system = "x86_64-linux"; specialArgs = inputs; modules = [ - ./configuration.nix + ./hosts/nixos/configuration.nix ]; }; }; }; - }