From 9a0d2fc9c6d34c3bfbf405372ea102cdbd86c615 Mon Sep 17 00:00:00 2001
From: June <june@jsts.xyz>
Date: Tue, 30 Jul 2024 01:17:05 +0200
Subject: [PATCH] Clean up networking configs by making them all use the same
 layout

Also use the v6 gateway as a nameserver as well for the esphome host.
---
 .../audio-hauptraum-kueche/networking.nix     |  7 ++--
 .../audio-hauptraum-tafel/networking.nix      |  7 ++--
 config/hosts/eh22-wiki/networking.nix         | 25 ++++++------
 config/hosts/esphome/networking.nix           | 39 +++++++++----------
 .../forgejo-actions-runner/networking.nix     | 24 ++++++------
 config/hosts/git/networking.nix               | 39 +++++++++----------
 config/hosts/matrix/networking.nix            | 22 ++++++-----
 config/hosts/mjolnir/networking.nix           | 22 ++++++-----
 config/hosts/mqtt/networking.nix              | 33 ++++++++--------
 config/hosts/netbox/networking.nix            | 30 +++++++-------
 config/hosts/nix-box-june/networking.nix      | 26 ++++++-------
 .../hosts/ptouch-print-server/networking.nix  |  4 +-
 config/hosts/public-web-static/networking.nix | 22 ++++++-----
 config/hosts/woodpecker/networking.nix        | 25 ++++++------
 config/hosts/yate/networking.nix              |  2 +-
 15 files changed, 162 insertions(+), 165 deletions(-)

diff --git a/config/hosts/audio-hauptraum-kueche/networking.nix b/config/hosts/audio-hauptraum-kueche/networking.nix
index ee01d0b..0118db4 100644
--- a/config/hosts/audio-hauptraum-kueche/networking.nix
+++ b/config/hosts/audio-hauptraum-kueche/networking.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 {
   networking = {
@@ -11,10 +11,9 @@
       ];
     };
     defaultGateway = "10.31.210.1";
-    nameservers = [
-      "10.31.210.1"
-    ];
+    nameservers = [ "10.31.210.1" ];
   };
+
   systemd.network.links."10-net0" = {
     matchConfig.MACAddress = "1E:EF:2D:92:81:DA";
     linkConfig.Name = "net0";
diff --git a/config/hosts/audio-hauptraum-tafel/networking.nix b/config/hosts/audio-hauptraum-tafel/networking.nix
index 6052909..37185b7 100644
--- a/config/hosts/audio-hauptraum-tafel/networking.nix
+++ b/config/hosts/audio-hauptraum-tafel/networking.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 {
   networking = {
@@ -11,10 +11,9 @@
       ];
     };
     defaultGateway = "10.31.210.1";
-    nameservers = [
-      "10.31.210.1"
-    ];
+    nameservers = [ "10.31.210.1" ];
   };
+
   systemd.network.links."10-net0" = {
     matchConfig.MACAddress = "D2:10:33:B1:72:C3";
     linkConfig.Name = "net0";
diff --git a/config/hosts/eh22-wiki/networking.nix b/config/hosts/eh22-wiki/networking.nix
index bddeabf..fba2da9 100644
--- a/config/hosts/eh22-wiki/networking.nix
+++ b/config/hosts/eh22-wiki/networking.nix
@@ -1,20 +1,19 @@
-# Sources for this configuration:
-# - https://nixos.wiki/wiki/Networking
-
 { ... }:
 
 {
-  networking.interfaces.net0 = {
-    ipv4.addresses = [
-      {
-        address = "172.31.17.159";
-        prefixLength = 25;
-      }
-    ];
+  networking = {
+    interfaces.net0 = {
+      ipv4.addresses = [
+        {
+          address = "172.31.17.159";
+          prefixLength = 25;
+        }
+      ];
+    };
+    defaultGateway = "172.31.17.129";
+    nameservers = [ "212.12.50.158" "192.76.134.90" ];
+    search = [ "hamburg.ccc.de" ];
   };
-  networking.defaultGateway = "172.31.17.129";
-  networking.nameservers = [ "212.12.50.158" "192.76.134.90" ];
-  networking.search = [ "hamburg.ccc.de" ];
 
   systemd.network.links."10-net0" = {
     matchConfig.MACAddress = "BC:24:11:37:F0:AB";
diff --git a/config/hosts/esphome/networking.nix b/config/hosts/esphome/networking.nix
index 6f65f93..a2c64d3 100644
--- a/config/hosts/esphome/networking.nix
+++ b/config/hosts/esphome/networking.nix
@@ -1,27 +1,26 @@
 { ... }:
 
 {
-  networking.interfaces.net0 = {
-    ipv4.addresses = [
-      {
-        address = "10.31.208.24";
-        prefixLength = 23;
-      }
-    ];
+  networking = {
+    interfaces.net0 = {
+      ipv4.addresses = [
+        {
+          address = "10.31.208.24";
+          prefixLength = 23;
+        }
+      ];
+      ipv6.addresses = [
+        {
+          address = "2a07:c480:0:1d0::66";
+          prefixLength = 64;
+        }
+      ];
+    };
+    defaultGateway = "10.31.208.1";
+    defaultGateway6 = "2a07:c480:0:1d0::1";
+    nameservers = [ "10.31.208.1" "2a07:c480:0:1d0::1" ];
+    search = [ "z9.ccchh.net" ];
   };
-  networking.defaultGateway = "10.31.208.1";
-  networking.nameservers = [ "10.31.208.1" ];
-  networking.search = [ "z9.ccchh.net" ];
-
-  networking.interfaces.net0 = {
-    ipv6.addresses = [
-      {
-        address = "2a07:c480:0:1d0::66";
-        prefixLength = 64;
-      }
-    ];
-  };
-  networking.defaultGateway6 = "2a07:c480:0:1d0::1";
 
   systemd.network.links."10-net0" = {
     matchConfig.MACAddress = "7E:3C:F0:77:8A:F4";
diff --git a/config/hosts/forgejo-actions-runner/networking.nix b/config/hosts/forgejo-actions-runner/networking.nix
index 7c5e178..8990224 100644
--- a/config/hosts/forgejo-actions-runner/networking.nix
+++ b/config/hosts/forgejo-actions-runner/networking.nix
@@ -1,17 +1,19 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 {
-  networking.interfaces.net0 = {
-    ipv4.addresses = [
-      {
-        address = "172.31.17.155";
-        prefixLength = 25;
-      }
-    ];
+  networking = {
+    interfaces.net0 = {
+      ipv4.addresses = [
+        {
+          address = "172.31.17.155";
+          prefixLength = 25;
+        }
+      ];
+    };
+    defaultGateway = "172.31.17.129";
+    nameservers = [ "212.12.50.158" "192.76.134.90" ];
+    search = [ "hamburg.ccc.de" ];
   };
-  networking.defaultGateway = "172.31.17.129";
-  networking.nameservers = [ "212.12.50.158" "192.76.134.90" ];
-  networking.search = [ "hamburg.ccc.de" ];
 
   systemd.network.links."10-net0" = {
     matchConfig.MACAddress = "1E:E0:4E:D0:DA:BE";
diff --git a/config/hosts/git/networking.nix b/config/hosts/git/networking.nix
index b73b953..688fff3 100644
--- a/config/hosts/git/networking.nix
+++ b/config/hosts/git/networking.nix
@@ -4,27 +4,26 @@
 { ... }:
 
 {
-  networking.interfaces.net0 = {
-    ipv4.addresses = [
-      {
-        address = "212.12.51.136";
-        prefixLength = 28;
-      }
-    ];
+  networking = {
+    interfaces.net0 = {
+      ipv4.addresses = [
+        {
+          address = "212.12.51.136";
+          prefixLength = 28;
+        }
+      ];
+      ipv6.addresses = [
+        {
+          address = "2a00:14b0:f000:23:51:136::1";
+          prefixLength = 64;
+        }
+      ];
+    };
+    defaultGateway = "212.12.51.129";
+    defaultGateway6 = "2a00:14b0:f000:23::1";
+    nameservers = [ "212.12.50.158" "192.76.134.90" ];
+    search = [ "hamburg.ccc.de" ];
   };
-  networking.defaultGateway = "212.12.51.129";
-  networking.nameservers = [ "212.12.50.158" "192.76.134.90" ];
-  networking.search = [ "hamburg.ccc.de" ];
-
-  networking.interfaces.net0 = {
-    ipv6.addresses = [
-      {
-        address = "2a00:14b0:f000:23:51:136::1";
-        prefixLength = 64;
-      }
-    ];
-  };
-  networking.defaultGateway6 = "2a00:14b0:f000:23::1";
 
   systemd.network.links."10-net0" = {
     matchConfig.MACAddress = "92:7B:E6:12:A4:FA";
diff --git a/config/hosts/matrix/networking.nix b/config/hosts/matrix/networking.nix
index 370bbbd..5fa1aa1 100644
--- a/config/hosts/matrix/networking.nix
+++ b/config/hosts/matrix/networking.nix
@@ -1,17 +1,19 @@
 { ... }:
 
 {
-  networking.interfaces.net0 = {
-    ipv4.addresses = [
-      {
-        address = "172.31.17.150";
-        prefixLength = 25;
-      }
-    ];
+  networking = {
+    interfaces.net0 = {
+      ipv4.addresses = [
+        {
+          address = "172.31.17.150";
+          prefixLength = 25;
+        }
+      ];
+    };
+    defaultGateway = "172.31.17.129";
+    nameservers = [ "212.12.50.158" "192.76.134.90" ];
+    search = [ "hamburg.ccc.de" ];
   };
-  networking.defaultGateway = "172.31.17.129";
-  networking.nameservers = [ "212.12.50.158" "192.76.134.90" ];
-  networking.search = [ "hamburg.ccc.de" ];
 
   systemd.network.links."10-net0" = {
     matchConfig.MACAddress = "2A:A5:80:C3:8E:32";
diff --git a/config/hosts/mjolnir/networking.nix b/config/hosts/mjolnir/networking.nix
index 04559f7..a441814 100644
--- a/config/hosts/mjolnir/networking.nix
+++ b/config/hosts/mjolnir/networking.nix
@@ -1,17 +1,19 @@
 { ... }:
 
 {
-  networking.interfaces.net0 = {
-    ipv4.addresses = [
-      {
-        address = "172.31.17.161";
-        prefixLength = 25;
-      }
-    ];
+  networking = {
+    interfaces.net0 = {
+      ipv4.addresses = [
+        {
+          address = "172.31.17.161";
+          prefixLength = 25;
+        }
+      ];
+    };
+    defaultGateway = "172.31.17.129";
+    nameservers = [ "212.12.50.158" "192.76.134.90" ];
+    search = [ "hamburg.ccc.de" ];
   };
-  networking.defaultGateway = "172.31.17.129";
-  networking.nameservers = [ "212.12.50.158" "192.76.134.90" ];
-  networking.search = [ "hamburg.ccc.de" ];
 
   systemd.network.links."10-net0" = {
     matchConfig.MACAddress = "BC:24:11:C9:F8:C5";
diff --git a/config/hosts/mqtt/networking.nix b/config/hosts/mqtt/networking.nix
index 5bd6616..7a34cbb 100644
--- a/config/hosts/mqtt/networking.nix
+++ b/config/hosts/mqtt/networking.nix
@@ -1,20 +1,21 @@
 { ... }:
 
 {
-    networking = {
-        interfaces.net0 = {
-            ipv4.addresses = [ {
-                address = "10.31.208.14";
-                prefixLength = 23;
-            } ];
-        };
-        defaultGateway = "10.31.208.1";
-        nameservers = [
-            "10.31.210.1"
-        ];
+  networking = {
+    interfaces.net0 = {
+      ipv4.addresses = [
+        {
+          address = "10.31.208.14";
+          prefixLength = 23;
+        }
+      ];
     };
-    systemd.network.links."10-net0" = {
-        matchConfig.MACAddress = "BC:24:11:48:85:73";
-        linkConfig.Name = "net0";
-    };
-}
\ No newline at end of file
+    defaultGateway = "10.31.208.1";
+    nameservers = [ "10.31.210.1" ];
+  };
+
+  systemd.network.links."10-net0" = {
+    matchConfig.MACAddress = "BC:24:11:48:85:73";
+    linkConfig.Name = "net0";
+  };
+}
diff --git a/config/hosts/netbox/networking.nix b/config/hosts/netbox/networking.nix
index dbfe9a6..a0abcfe 100644
--- a/config/hosts/netbox/networking.nix
+++ b/config/hosts/netbox/networking.nix
@@ -1,23 +1,19 @@
-# Networking configuration for the host.
-# Sources for this configuration:
-# - https://nixos.org/manual/nixos/stable/#sec-networking
-# - https://nixos.wiki/wiki/Systemd-networkd
-# - https://wiki.archlinux.org/title/Systemd-networkd
-
-{ config, pkgs, ... }:
+{ ... }:
 
 {
-  networking.interfaces.net0 = {
-    ipv4.addresses = [
-      {
-        address = "172.31.17.149";
-        prefixLength = 25;
-      }
-    ];
+  networking = {
+    interfaces.net0 = {
+      ipv4.addresses = [
+        {
+          address = "172.31.17.149";
+          prefixLength = 25;
+        }
+      ];
+    };
+    defaultGateway = "172.31.17.129";
+    nameservers = [ "212.12.50.158" "192.76.134.90" ];
+    search = [ "hamburg.ccc.de" ];
   };
-  networking.defaultGateway = "172.31.17.129";
-  networking.nameservers = [ "212.12.50.158" "192.76.134.90" ];
-  networking.search = [ "hamburg.ccc.de" ];
 
   systemd.network.links."10-net0" = {
     matchConfig.MACAddress = "62:ED:44:20:7C:C1";
diff --git a/config/hosts/nix-box-june/networking.nix b/config/hosts/nix-box-june/networking.nix
index 073250b..2c1faee 100644
--- a/config/hosts/nix-box-june/networking.nix
+++ b/config/hosts/nix-box-june/networking.nix
@@ -1,19 +1,19 @@
-# Networking configuration for the host.
-
-{ config, pkgs, ... }:
+{ ... }:
 
 {
-  networking.interfaces.net0 = {
-    ipv4.addresses = [
-      {
-        address = "172.31.17.158";
-        prefixLength = 25;
-      }
-    ];
+  networking = {
+    interfaces.net0 = {
+      ipv4.addresses = [
+        {
+          address = "172.31.17.158";
+          prefixLength = 25;
+        }
+      ];
+    };
+    defaultGateway = "172.31.17.129";
+    nameservers = [ "212.12.50.158" "192.76.134.90" ];
+    search = [ "hamburg.ccc.de" ];
   };
-  networking.defaultGateway = "172.31.17.129";
-  networking.nameservers = [ "212.12.50.158" "192.76.134.90" ];
-  networking.search = [ "hamburg.ccc.de" ];
 
   systemd.network.links."10-net0" = {
     matchConfig.MACAddress = "BC:24:11:6A:33:5F";
diff --git a/config/hosts/ptouch-print-server/networking.nix b/config/hosts/ptouch-print-server/networking.nix
index 7c7cb62..83031a1 100644
--- a/config/hosts/ptouch-print-server/networking.nix
+++ b/config/hosts/ptouch-print-server/networking.nix
@@ -11,9 +11,7 @@
       ];
     };
     defaultGateway = "10.31.208.1";
-    nameservers = [
-      "10.31.208.1"
-    ];
+    nameservers = [ "10.31.208.1" ];
   };
 
   systemd.network.links."10-net0" = {
diff --git a/config/hosts/public-web-static/networking.nix b/config/hosts/public-web-static/networking.nix
index 34b36f3..cb22d40 100644
--- a/config/hosts/public-web-static/networking.nix
+++ b/config/hosts/public-web-static/networking.nix
@@ -1,17 +1,19 @@
 { ... }:
 
 {
-  networking.interfaces.net0 = {
-    ipv4.addresses = [
-      {
-        address = "172.31.17.151";
-        prefixLength = 25;
-      }
-    ];
+  networking = {
+    interfaces.net0 = {
+      ipv4.addresses = [
+        {
+          address = "172.31.17.151";
+          prefixLength = 25;
+        }
+      ];
+    };
+    defaultGateway = "172.31.17.129";
+    nameservers = [ "212.12.50.158" "192.76.134.90" ];
+    search = [ "hamburg.ccc.de" ];
   };
-  networking.defaultGateway = "172.31.17.129";
-  networking.nameservers = [ "212.12.50.158" "192.76.134.90" ];
-  networking.search = [ "hamburg.ccc.de" ];
 
   systemd.network.links."10-net0" = {
     matchConfig.MACAddress = "86:72:08:F6:C0:D6";
diff --git a/config/hosts/woodpecker/networking.nix b/config/hosts/woodpecker/networking.nix
index 17fa56c..3301812 100644
--- a/config/hosts/woodpecker/networking.nix
+++ b/config/hosts/woodpecker/networking.nix
@@ -1,20 +1,19 @@
-# Sources for this configuration:
-# - https://nixos.wiki/wiki/Networking
-
 { ... }:
 
 {
-  networking.interfaces.net0 = {
-    ipv4.addresses = [
-      {
-        address = "172.31.17.160";
-        prefixLength = 25;
-      }
-    ];
+  networking = {
+    interfaces.net0 = {
+      ipv4.addresses = [
+        {
+          address = "172.31.17.160";
+          prefixLength = 25;
+        }
+      ];
+    };
+    defaultGateway = "172.31.17.129";
+    nameservers = [ "212.12.50.158" "192.76.134.90" ];
+    search = [ "hamburg.ccc.de" ];
   };
-  networking.defaultGateway = "172.31.17.129";
-  networking.nameservers = [ "212.12.50.158" "192.76.134.90" ];
-  networking.search = [ "hamburg.ccc.de" ];
 
   systemd.network.links."10-net0" = {
     matchConfig.MACAddress = "BC:24:11:5F:A9:B7";
diff --git a/config/hosts/yate/networking.nix b/config/hosts/yate/networking.nix
index 225edd2..a06a019 100644
--- a/config/hosts/yate/networking.nix
+++ b/config/hosts/yate/networking.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 {
   networking = {