diff --git a/boxes/desktop/configuration.nix b/boxes/desktop/configuration.nix index 67cb8d8..c2402c2 100644 --- a/boxes/desktop/configuration.nix +++ b/boxes/desktop/configuration.nix @@ -15,6 +15,7 @@ in ./hardware-configuration.nix ../../common/modules/audio.nix ../../common/modules/kde.nix + ../../common/users/meyer inputs.sops-nix.nixosModules.sops ]; sops.defaultSopsFile = ../../secrets.yaml; @@ -32,7 +33,6 @@ in "audio" "sound" "video" - "networkmanager" "input" "tty" "plugdev" @@ -63,7 +63,6 @@ in networking.hostName = "nix-desktop-evo4b5"; # Define your hostname. # Pick only one of the below networking options. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. # Set your time zone. time.timeZone = "America/New_York"; @@ -114,7 +113,6 @@ in # networking.nameservers = ["10.0.0.97" "1.1.1.1"]; - networking.nameservers = [ "10.0.0.97" ]; # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ diff --git a/common/users/meyer/default.nix b/common/users/meyer/default.nix new file mode 100644 index 0000000..ac423b5 --- /dev/null +++ b/common/users/meyer/default.nix @@ -0,0 +1,9 @@ +{ ... }: +let + NAME = "meyer"; +in +{ + imports = [ + (import ../modules/networkManager.nix { inherit NAME; }) + ]; +} diff --git a/common/users/modules/networkManager.nix b/common/users/modules/networkManager.nix new file mode 100644 index 0000000..c3597e4 --- /dev/null +++ b/common/users/modules/networkManager.nix @@ -0,0 +1,17 @@ +{ NAME }: { ... }: { + users = { + users = { + "${NAME}" = { + extraGroups = [ + "networkmanager" + ]; + }; + }; + }; + networking = { + networkmanager = { + enable = true; + }; + nameservers = [ "1.1.1.1" "1.0.0.1" ]; + }; +}