From 81770375e2be0549c84828307251208d554954c0 Mon Sep 17 00:00:00 2001
From: Christoph Cullmann <christoph@cullmann.dev>
Date: Fri, 4 Jul 2025 19:29:05 +0200
Subject: [PATCH] try to fix network config to work on Macs, too

---
 beta/configuration.nix | 8 ++++++++
 miku/configuration.nix | 4 ++++
 neko/configuration.nix | 4 ++++
 share/common.nix       | 9 +--------
 zeta/configuration.nix | 8 ++++++++
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/beta/configuration.nix b/beta/configuration.nix
index 76b0936..285ccb5 100644
--- a/beta/configuration.nix
+++ b/beta/configuration.nix
@@ -17,6 +17,14 @@
   networking.hostName = "beta";
   networking.hostId = "c07bab49";
 
+  # use NetworkManager, if we have WiFi, allows Plasma to manage connections
+  # use iwd, only thing that works properly on e.g. Macs
+  networking.networkmanager.enable = true;
+  networking.wireless.iwd = {
+    enable = true;
+    settings.General.EnableNetworkConfiguration = true;
+  };
+
   # german laptop keyboard
   services.xserver.xkb.layout = "de";
 }
diff --git a/miku/configuration.nix b/miku/configuration.nix
index 3ab5d8d..1790c53 100644
--- a/miku/configuration.nix
+++ b/miku/configuration.nix
@@ -17,6 +17,10 @@
   networking.hostName = "miku";
   networking.hostId = "4d00f481";
 
+  # just classic DHCP, wired only
+  networking.networkmanager.enable = false;
+  networking.useDHCP = true;
+
   # EurKey layout
   services.xserver.xkb.layout = "eu";
 }
diff --git a/neko/configuration.nix b/neko/configuration.nix
index c22d12c..15f6c14 100644
--- a/neko/configuration.nix
+++ b/neko/configuration.nix
@@ -17,6 +17,10 @@
   networking.hostName = "neko";
   networking.hostId = "4836f248";
 
+  # just classic DHCP, wired only
+  networking.networkmanager.enable = false;
+  networking.useDHCP = true;
+
   # EurKey layout
   services.xserver.xkb.layout = "eu";
 }
diff --git a/share/common.nix b/share/common.nix
index 286adfd..6682fa9 100644
--- a/share/common.nix
+++ b/share/common.nix
@@ -234,15 +234,8 @@ in
   # allow all firmware
   hardware.enableAllFirmware = true;
 
-  # use NetworkManager, works well for WiFi, too
-  networking.networkmanager.enable = true;
-
-  # use iwd, only thing that works properly on e.g. Macs
+  # never the wireless variant, we use iwd, if at all
   networking.wireless.enable = false;
-  networking.wireless.iwd = {
-    enable = true;
-    settings.General.EnableNetworkConfiguration = true;
-  };
 
   # ensure firewall is up, allow ssh in
   networking.firewall.enable = true;
diff --git a/zeta/configuration.nix b/zeta/configuration.nix
index 3a98fc8..37df190 100644
--- a/zeta/configuration.nix
+++ b/zeta/configuration.nix
@@ -18,6 +18,14 @@
   networking.hostName = "zeta";
   networking.hostId = "cce4e4c1";
 
+  # use NetworkManager, if we have WiFi, allows Plasma to manage connections
+  # use iwd, only thing that works properly on e.g. Macs
+  networking.networkmanager.enable = true;
+  networking.wireless.iwd = {
+    enable = true;
+    settings.General.EnableNetworkConfiguration = true;
+  };
+
   # german laptop keyboard
   services.xserver.xkb.layout = "de";
 }