From 95547074ef9eb3c5a894283b212c35e8e95be744 Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Sat, 10 Aug 2024 09:05:33 -0400
Subject: [PATCH] jeeves conversion

---
 systems/jeeves/configuration.nix |  7 +-----
 systems/jeeves/hardware.nix      | 11 ---------
 systems/jeeves/networking.nix    | 40 ++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 17 deletions(-)
 create mode 100644 systems/jeeves/networking.nix

diff --git a/systems/jeeves/configuration.nix b/systems/jeeves/configuration.nix
index 9564cc2..b8522af 100644
--- a/systems/jeeves/configuration.nix
+++ b/systems/jeeves/configuration.nix
@@ -6,18 +6,13 @@ in
   imports = [
     ../../users/richie/global/ssh.nix
     ../../users/richie/global/syncthing_base.nix
-    ../../users/richie/global/zerotier.nix
     ./arch_mirror.nix
     ./docker
+    ./networking.nix
     ./programs.nix
     ./services.nix
   ];
 
-  networking = {
-    hostId = "1beb3027";
-    firewall.enable = false;
-  };
-
   boot = {
     zfs.extraPools = [
       "media"
diff --git a/systems/jeeves/hardware.nix b/systems/jeeves/hardware.nix
index 1e09bc4..e4bbc90 100644
--- a/systems/jeeves/hardware.nix
+++ b/systems/jeeves/hardware.nix
@@ -40,17 +40,6 @@
 
   swapDevices = [ { device = "/dev/disk/by-uuid/4c797a94-be32-43d3-89ac-7f02912c7cf5"; } ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp38s0f3u2u2c2.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp97s0f0np0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp97s0f1np1.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp98s0f0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp98s0f1.useDHCP = lib.mkDefault true;
-
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/systems/jeeves/networking.nix b/systems/jeeves/networking.nix
new file mode 100644
index 0000000..6d715b1
--- /dev/null
+++ b/systems/jeeves/networking.nix
@@ -0,0 +1,40 @@
+{
+  networking = {
+    hostId = "1beb3027";
+    firewall.enable = false;
+  };
+
+  systemd.network = {
+    enable = true;
+    networks = {
+      "10-1GB_Primary" = {
+        matchConfig.Name = "enp98s0f0";
+        DHCP = "yes";
+      };
+    };
+    networks = {
+      "10-1GB_Secondary" = {
+        matchConfig.Name = "enp98s0f1";
+        DHCP = "yes";
+      };
+    };
+    networks = {
+      "10-10GB_Primary" = {
+        matchConfig.Name = "enp97s0f0np0";
+        DHCP = "yes";
+        linkConfig.RequiredForOnline = "routable";
+      };
+    };
+    networks = {
+      "10-10GB_Secondary" = {
+        matchConfig.Name = "enp97s0f1np1";
+        DHCP = "yes";
+      };
+    };
+  };
+
+  services.zerotierone = {
+    enable = true;
+    joinNetworks = [ "e4da7455b2ae64ca" ];
+  };
+}