Use metadata in more places

hosts/genesis/networking.nix

@@ -1,10 +1,15 @@
-{ config, pkgs, ... }:
+{
+  config,
+  pkgs,
+  metadata,
+  ...
+}:
 let
-  lan = "ens18";
+  lan = "enp1s0";
-  lanIP = "10.42.1.5";
+  lanIP = metadata.hosts.${config.networking.hostName}.ip;
-  iot = "ens19";
+  iot = "enp2s0";
   iotIP = "192.168.66.250";
-  routerIP = "10.42.1.2";
+  routerIP = metadata.infra.gw;
   extraHosts = builtins.readFile ./net/hosts;
 
   adblockUpdate = pkgs.writeShellScriptBin "adblockUpdate" (builtins.readFile ./adblockUpdate.sh);
@@ -12,10 +17,11 @@ let
   dnsPort = 53;
   dhcpPort = 67;
   dnsServers = [
-    "9.9.9.9" # Quad 9
+    #"9.9.9.9" # Quad 9
-    "1.1.1.1" # Cloudflare
+    #"1.1.1.1" # Cloudflare
-    "1.0.0.1" # Cloudflare
+    #"1.0.0.1" # Cloudflare
-    "149.112.112.112" # Quad 9
+    #"149.112.112.112" # Quad 9
+    metadata.infra.gw # Currently using our UniFi router for DNS as well
   ];
 in
 {
@@ -32,9 +38,9 @@ in
   };
 
   networking = {
+    defaultGateway = metadata.infra.gw;
     enableIPv6 = false;
     networkmanager.enable = pkgs.lib.mkForce false;
-    defaultGateway = routerIP;
     nameservers = dnsServers;
     interfaces = {
       # This is our LAN port

hosts/hosea/default.nix

@@ -4,13 +4,14 @@
 
 {
   config,
+  metadata,
   pkgs,
   ...
 }:
 let
   wanInterface = "enp2s0";
   lanInterface = "enp1s0";
-  lanIpAddress = "10.42.1.7";
+  lanIpAddress = metadata.hosts.${config.networking.hostName}.ip;
 in
 
 {
@@ -70,8 +71,8 @@ in
 
   networking = {
     hostName = "hosea";
-    nameservers = [ "10.42.1.5" ];
+    nameservers = [ metadata.infra.dns ];
-    defaultGateway = "10.42.1.1";
+    defaultGateway = metadata.infra.gw;
     interfaces = {
       "${wanInterface}".useDHCP = true;
       "${lanInterface}" = {

hosts/isaiah/default.nix

@@ -1,5 +1,7 @@
 {
+  config,
   lib,
+  metadata,
   ...
 }:
 {
@@ -36,7 +38,7 @@
     kubernetes = {
       enable = true;
       vipInterface = "enp38s0";
-      vip = "10.42.1.6";
+      vip = metadata.hosts.${config.networking.hostName}.ip;
       priority = 255;
     };
     tailscale = {

hosts/jeremiah/default.nix

@@ -1,13 +1,14 @@
 {
   config,
   lib,
+  metadata,
   pkgs,
   top,
   ...
 }:
 
 let
-  ip = "10.42.1.8";
+  ip = metadata.hosts.${config.networking.hostName}.ip;
   mk = file: {
     inherit file;
     owner = "buildbot";
@@ -115,7 +116,7 @@ in
       interfaces = [ "enp68s0" ];
     };
     defaultGateway = {
-      address = " 10.42.1.2";
+      address = metadata.infra.gw;
       interface = "br0";
     };
     firewall.allowedTCPPorts = [
@@ -130,7 +131,7 @@ in
         }
       ];
     };
-    nameservers = [ "10.42.1.5" ];
+    nameservers = [ metadata.infra.dns ];
   };
 
   programs.steam = {

hosts/zeke/default.nix

@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  metadata,
   top,
   ...
 }:
@@ -64,7 +65,7 @@
   services = {
     k3s = {
       extraFlags = [
-        "--tls-san 10.42.1.13"
+        "--tls-san ${metadata.hosts.${config.networking.hostName}.ip}"
         #"--bind-address ${ip}"
       ];
     };