From ced5ee06334f64019c091aa4bce8845fa06a6fa9 Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Sun, 26 May 2024 11:06:40 -0400
Subject: [PATCH] start networkd rewrite

---
 .vscode/settings.json |  2 ++
 modules/kub_net.nix   | 32 +++++++++++++++++++++++---------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 900768d..415f1ae 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -55,6 +55,8 @@
     "ncdu",
     "nemo",
     "neofetch",
+    "netdev",
+    "netdevs",
     "networkd",
     "networkmanager",
     "nixos",
diff --git a/modules/kub_net.nix b/modules/kub_net.nix
index 761d1ea..a1a4c6b 100644
--- a/modules/kub_net.nix
+++ b/modules/kub_net.nix
@@ -8,14 +8,28 @@
     enable = true;
     joinNetworks = [ "ebe7fbd44565ba9d" ];
   };
-
-  networking = {
-    bridges.brkubnet.interfaces = [ "ztkubnet" ];
-    interfaces.brkubnet.ipv4.addresses = [
-      {
-        address = "192.168.69.0";
-        prefixLength = 24;
-      }
-    ];
+  systemd.network = {
+    enable = true;
+    wait-online.anyInterface = true;
+    netdevs = {
+      "20-brkubnet" = {
+        netdevConfig = {
+          Kind = "bridge";
+          Name = "brkubnet";
+        };
+      };
+    };
+    networks = {
+      "30-ztkubnet" = {
+        matchConfig.Name = "ztkubnet";
+        networkConfig.Bridge = "brkubnet";
+        linkConfig.RequiredForOnline = "enslaved";
+      };
+      "40-brkubnet" = {
+        matchConfig.Name = "brkubnet";
+        bridgeConfig = { };
+        linkConfig.RequiredForOnline = "no";
+      };
+    };
   };
 }