From 0624de4676c2307c3ca37760ef2fc2d1773fedca Mon Sep 17 00:00:00 2001
From: Christoph Cullmann <christoph@cullmann.io>
Date: Thu, 4 Jul 2024 18:44:40 +0200
Subject: [PATCH] use network manager

move hardware settings to one file
---
 beta/configuration.nix          | 6 ------
 beta/hardware-configuration.nix | 3 +++
 common.nix                      | 3 +++
 mini/configuration.nix          | 6 ------
 mini/hardware-configuration.nix | 3 +++
 neko/configuration.nix          | 6 ------
 neko/hardware-configuration.nix | 3 +++
 7 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/beta/configuration.nix b/beta/configuration.nix
index 2b233ac..2c58810 100644
--- a/beta/configuration.nix
+++ b/beta/configuration.nix
@@ -14,16 +14,10 @@
       /data/nixos/common.nix
     ];
 
-  # amd graphics
-  hardware.graphics.extraPackages = with pkgs; [ amdvlk rocm-opencl-icd rocm-opencl-runtime ];
-
   # our hostname and an ID for ZFS
   networking.hostName = "beta";
   networking.hostId = "3f20def9";
 
-  # classic dhcpcd
-  networking.networkmanager.enable = false;
-
   # german laptop keyboard
   services.xserver.xkb.layout = "de";
 }
diff --git a/beta/hardware-configuration.nix b/beta/hardware-configuration.nix
index b2d68f4..5a93531 100644
--- a/beta/hardware-configuration.nix
+++ b/beta/hardware-configuration.nix
@@ -19,4 +19,7 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  # amd graphics
+  hardware.graphics.extraPackages = with pkgs; [ amdvlk rocm-opencl-icd rocm-opencl-runtime ];
 }
diff --git a/common.nix b/common.nix
index d6c653c..a5f9c6a 100644
--- a/common.nix
+++ b/common.nix
@@ -149,6 +149,9 @@ in
   # allow all firmware
   hardware.enableAllFirmware = true;
 
+  # use NetworkManager, works well for WiFi, too
+  networking.networkmanager.enable = true;
+
   # ensure firewall is up, allow ssh in
   networking.firewall.enable = true;
   networking.firewall.allowedTCPPorts = [ 22 ];
diff --git a/mini/configuration.nix b/mini/configuration.nix
index ce298da..cd843ee 100644
--- a/mini/configuration.nix
+++ b/mini/configuration.nix
@@ -14,16 +14,10 @@
       /data/nixos/common.nix
     ];
 
-  # amd graphics
-  hardware.graphics.extraPackages = with pkgs; [ amdvlk rocm-opencl-icd rocm-opencl-runtime ];
-
   # our hostname and an ID for ZFS
   networking.hostName = "mini";
   networking.hostId = "e925ccfb";
 
-  # classic dhcpcd
-  networking.networkmanager.enable = false;
-
   # EurKey layout
   services.xserver.xkb.layout = "eu";
 }
diff --git a/mini/hardware-configuration.nix b/mini/hardware-configuration.nix
index 8472002..e02d525 100644
--- a/mini/hardware-configuration.nix
+++ b/mini/hardware-configuration.nix
@@ -26,4 +26,7 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  # amd graphics
+  hardware.graphics.extraPackages = with pkgs; [ amdvlk rocm-opencl-icd rocm-opencl-runtime ];
 }
diff --git a/neko/configuration.nix b/neko/configuration.nix
index f8686de..946bef6 100644
--- a/neko/configuration.nix
+++ b/neko/configuration.nix
@@ -14,16 +14,10 @@
       /data/nixos/common.nix
     ];
 
-  # intel graphics
-  hardware.graphics.extraPackages = with pkgs; [ intel-media-driver intel-compute-runtime ];
-
   # our hostname and an ID for ZFS
   networking.hostName = "neko";
   networking.hostId = "cf5a5ee6";
 
-  # classic dhcpcd
-  networking.networkmanager.enable = false;
-
   # EurKey layout
   services.xserver.xkb.layout = "eu";
 }
diff --git a/neko/hardware-configuration.nix b/neko/hardware-configuration.nix
index 65bc1de..bc4e040 100644
--- a/neko/hardware-configuration.nix
+++ b/neko/hardware-configuration.nix
@@ -33,4 +33,7 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  # intel graphics
+  hardware.graphics.extraPackages = with pkgs; [ intel-media-driver intel-compute-runtime ];
 }