From 3f0c32302df62e4e86ce6e342f849307a77d937a Mon Sep 17 00:00:00 2001
From: Christoph Cullmann <cullmann@kde.org>
Date: Mon, 12 Jun 2023 18:19:39 +0200
Subject: better network config

---
 common.nix             | 14 --------------
 mini/configuration.nix | 10 ++++++++--
 neko/configuration.nix | 10 ++++++++--
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/common.nix b/common.nix
index 5cf0b62..ada58dd 100644
--- a/common.nix
+++ b/common.nix
@@ -62,20 +62,6 @@ in
   # allow all firmware
   hardware.enableAllFirmware = true;
 
-  # use systemd-networkd
-  networking.useDHCP = false;
-  systemd.network.enable = true;
-   systemd.network.networks."10-wan" = {
-    networkConfig = {
-      # start a DHCP Client for IPv4 Addressing/Routing
-      DHCP = "ipv4";
-      # accept Router Advertisements for Stateless IPv6 Autoconfiguraton (SLAAC)
-      IPv6AcceptRA = true;
-    };
-    # make routing on this interface a dependency for network-online.target
-    linkConfig.RequiredForOnline = "routable";
-  };
-
   # ensure firewall is up, allow ssh and http in
   networking.firewall.enable = true;
   networking.firewall.allowedTCPPorts = [ 22 ];
diff --git a/mini/configuration.nix b/mini/configuration.nix
index 63babbb..a930f87 100644
--- a/mini/configuration.nix
+++ b/mini/configuration.nix
@@ -17,8 +17,14 @@
   # host name
   networking.hostName = "mini";
 
-  # main network interface
-  systemd.network.networks."10-wan".matchConfig.Name = "eno1";
+  # main network interface via systemd-networkd
+  networking.useDHCP = false;
+  systemd.network.enable = true;
+  systemd.network.networks."10-lan" = {
+    matchConfig.Name = "eno1";
+    networkConfig.DHCP = "yes";
+    linkConfig.RequiredForOnline = "routable";
+  };
 
   # amd graphics
   hardware.opengl.extraPackages = with pkgs; [ amdvlk rocm-opencl-icd rocm-opencl-runtime ];
diff --git a/neko/configuration.nix b/neko/configuration.nix
index 7b667a9..881e8bf 100644
--- a/neko/configuration.nix
+++ b/neko/configuration.nix
@@ -17,8 +17,14 @@
   # host name
   networking.hostName = "neko";
 
-  # main network interface
-  systemd.network.networks."10-wan".matchConfig.Name = "enp9s0";
+  # main network interface via systemd-networkd
+  networking.useDHCP = false;
+  systemd.network.enable = true;
+  systemd.network.networks."10-lan" = {
+    matchConfig.Name = "enp9s0";
+    networkConfig.DHCP = "yes";
+    linkConfig.RequiredForOnline = "routable";
+  };
 
   # intel graphics
   hardware.opengl.extraPackages = with pkgs; [ intel-media-driver intel-compute-runtime ];
-- 
cgit v1.2.3