Move dhcp reservations inside subnet, so they work

hosts/genesis/net/hosts

@@ -8,7 +8,7 @@
 10.42.1.2 opnsense router opnsense.thehellings.lan router.thehellings.lan
 10.42.1.3 printer.thehellings.lan
 10.42.1.4 chronicles chronicles.thehellings.lan nas.thehellings.lan s3.thehellings.lan
-10.42.1.5 genesis genesis.thehellings.lan dns dns.thehellings.lan smart smart.thehellings.lan jellyfin jellyfin.thehellings.lan speedtest.thehellings.lan nixcache.thehellings.lan gitcache.thehellings.lan
+10.42.1.5 genesis genesis.thehellings.lan dns dns.thehellings.lan smart smart.thehellings.lan speedtest.thehellings.lan nixcache.thehellings.lan gitcache.thehellings.lan
 10.42.1.6 isaiah isaiah.thehellings.lan minio-01.thehellings.lan
 10.42.1.7 hosea hosea.thehellings.lan
 10.42.1.8 jeremiah jeremiah.thehellings.lan minio-02.thehellings.lan
@@ -17,6 +17,7 @@
 
 # VMs
 10.42.4.1 matrix matrix.thehellings.lan
+10.42.4.2 jellyfin jellyfin.thehellings.lan vm-jellyfin vm-jellyfin.thehellings.lan
 
 # IPMI
 10.42.100.6 isaiahbmc isaiahbmc.thehellings.lan
@@ -25,7 +26,7 @@
 100.119.228.115 chronicles.home nas.home chronicles.shire-zebra.ts.net
 100.88.91.27 dns.home
 100.80.99.48 exodus.home
-100.88.91.27 genesis.home jellyfin.home smart.home zwave.home nixcache.home gitcache.home
+100.88.91.27 genesis.home smart.home zwave.home nixcache.home gitcache.home
 100.78.226.76 gitlab.home gitlab.shire-zebra.ts.net gitlab.thehellings.lan registry.thehellings.lan git.thehellings.lan
 100.68.203.1 hosea.home hosea.shire-zebra.ts.net
 100.84.183.79 isaiah.home isaiah.shire-zebra.ts.net

hosts/genesis/networking/dhcp.nix

@@ -48,24 +48,9 @@
             data = "thehellings.lan";
           }
         ];
-      }
+        reservations-global = false;
-      {
+        reservations-in-subnet = true;
-        subnet = "192.168.66.0/24";
+        reservations-out-of-pool = false;
-        pools = [ { pool = "192.168.66.2 - 192.168.66.254"; } ];
-        interface = iot;
-        option-data = [
-          {
-            name = "domain-name-servers";
-            data = iotIP;
-          }
-          {
-            name = "routers";
-            data = "192.168.67.1";
-          }
-        ];
-      }
-    ];
-
         reservations = [
           # Static IPs for personal work
           {
@@ -123,74 +108,30 @@
 
           {
             hw-address = "52:54:00:2a:74:2f";
-        ip-address = "10.43.4.1"; # Dendrite
+            ip-address = "10.42.4.1"; # Dendrite
           }
           {
-        hw-address = "52:54:00:6e:eb:83";
+            hw-address = "52:54:00:70:ce:fa";
-        ip-address = "10.43.4.2"; # Jellyfin
+            ip-address = "10.42.4.2"; # Jellyfin
           }
-
-      ########################################
-      #             IOT devices              #
-      ########################################
-
-      # Static IPs for things in the IOT range
-      {
-        hw-address = "b4:b0:24:9a:02:4a";
-        ip-address = "192.168.66.5";
-      } # LD125
-      {
-        hw-address = "f0:03:8c:b3:b0:f6";
-        ip-address = "192.168.66.55";
-      } # Roomba
-      {
-        hw-address = "4c:a1:61:05:cd:52";
-        ip-address = "192.168.66.61";
-      } # Rainbird
-      {
-        hw-address = "48:d6:d5:5d:81:21";
-        ip-address = "192.168.66.65";
-      } # Google Home
-      {
-        hw-address = "28:87:ba:0e:ca:da";
-        ip-address = "192.168.66.74";
-      }
-      {
-        hw-address = "54:af:97:83:ed:33";
-        ip-address = "192.168.66.80";
-      }
-      {
-        hw-address = "ac:84:c6:5e:4b:28";
-        ip-address = "192.168.66.100";
-      }
-      {
-        hw-address = "8c:85:80:1c:f9:d1";
-        ip-address = "192.168.66.104";
-      }
-      {
-        hw-address = "8c:49:62:aa:58:60";
-        ip-address = "192.168.66.108";
-      } # Roku, HiHandsome
-      {
-        hw-address = "92:3e:11:c7:c5:be";
-        ip-address = "192.168.66.109";
-      }
-      {
-        hw-address = "d8:0d:17:19:60:62";
-        ip-address = "192.168.66.112";
-      }
-      {
-        hw-address = "b4:b0:24:9a:12:53";
-        ip-address = "192.168.66.130";
-      } # KL125
-      {
-        hw-address = "b4:b0:24:9a:14:0e";
-        ip-address = "192.168.66.131";
-      }
-      {
-        hw-address = "e4:f0:42:61:fa:b5";
-        ip-address = "192.168.66.149";
-      } # Google Home-mini
         ];
+      }
+      {
+        subnet = "192.168.66.0/24";
+        pools = [ { pool = "192.168.66.2 - 192.168.66.254"; } ];
+        interface = iot;
+        option-data = [
+          {
+            name = "domain-name-servers";
+            data = iotIP;
+          }
+          {
+            name = "routers";
+            data = "192.168.67.1";
+          }
+        ];
+      }
+    ];
+
   };
 }