From d740880c5f65591c978bbcf528a155322265bc0a Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Thu, 7 Dec 2023 11:45:03 -0600
Subject: [PATCH] Update networking

---
 hosts/genesis/networking.nix | 26 ++++++++++++++++----------
 modules-linux/default.nix    |  2 +-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/hosts/genesis/networking.nix b/hosts/genesis/networking.nix
index 496e3dc..1fe9a8a 100644
--- a/hosts/genesis/networking.nix
+++ b/hosts/genesis/networking.nix
@@ -7,21 +7,23 @@ let
 	routerIP = "10.42.1.2";
 	extraHosts = builtins.concatStringsSep "\n" [
 		# Local hosts
-		"10.42.0.1 switch"
+		"10.42.0.1 switch switch.thehellings.lan"
 		"10.42.1.1 pve1.thehellings.lan"
 		"10.42.1.2 opnsense router opnsense.thehellings.lan router.thehellings.lan"
-		"10.42.1.3 printer"
-		"10.42.1.4 chronicles nas"
+		"10.42.1.3 printer.thehellings.lan"
+		"10.42.1.4 chronicles chronicles.thehellings.lan nas.thehellings.lan"
 		"10.42.1.5 genesis genesis.thehellings.lan dns dns.thehellings.lan smart smart.thehellings.lan jellyfin jellyfin.thehellings.lan"
+		"10.42.1.6 isaiah isaiah.thehellings.lan"
 		"10.42.1.12 tv"
 
+		"10.42.100.6 isaiahbmc isaiahbmc.thehellings.lan"
 		# Tailscale hosts
-		"100.90.74.19 jude.shire-zebra.ts.net"
-		"100.88.91.27 dns.shire-zebra.ts.net"
-		"100.119.228.115 chronicles.shire-zebra.ts.net"
-		"100.115.57.8 linode.shire-zebra.ts.net"
-		"100.88.91.27 genesis.shire-zebra.ts.net jellyfin.home smart.home zwave.home"
-		"100.78.16.88 mm.shire-zebra.ts.net"
+		"100.90.74.19 jude.home"
+		"100.88.91.27 dns.home"
+		"100.119.228.115 chronicles.home nas.home"
+		"100.115.57.8 linode.home"
+		"100.88.91.27 genesis.home jellyfin.home smart.home zwave.home"
+		"100.78.16.88 mm.home"
 
 		# Dev hosts
 		"10.42.101.1 icdm.lan wiki.icdm.lan *.icdm.lan"
@@ -87,9 +89,9 @@ in {
 			];
 		};
 		nftables.enable = true;
-		extraHosts = "${extraHosts}";
 	};
 
+	environment.etc."hosts.d/local".text = extraHosts;
 
 	fileSystems."/media" = {
 		device = "10.42.1.4:/volume1/video/";
@@ -148,6 +150,7 @@ in {
 				dhcp-host = [
 					# Static IPs for personal work
 					"00:00:de:ad:be:ef,10.42.2.254"
+					"01:a8:a1:59:c7:8a:12,10.42.2.253"  # BMC management interface for isaiah
 
 					# Static IPs for things in the IOT range
 					"b4:b0:24:9a:02:4a,192.168.66.5"  # LD125
@@ -181,7 +184,9 @@ in {
 				expand-hosts = true;
 				log-dhcp = true;
 				log-queries = true;
+				no-hosts = true;  # Do not read /etc/hosts, which makes genesis resolve to 127.0.0.2
 				addn-hosts = "/etc/adblock_hosts";
+				hostsdir = "/etc/hosts.d/";
 				server = dnsServers;
 			};
 			extraConfig = "${extraConfig}";
@@ -207,5 +212,6 @@ in {
 
 	environment.systemPackages = with pkgs; [
 		curl  # Used by dnsmasq fetching
+		sqlite
 	];
 }
diff --git a/modules-linux/default.nix b/modules-linux/default.nix
index 8b6757f..2ac57da 100644
--- a/modules-linux/default.nix
+++ b/modules-linux/default.nix
@@ -30,7 +30,7 @@
 	networking = {
 		search = [
 			"thehellings.lan"
-			"shire-zebra.ts.net"
+			"home"
 		];
 		networkmanager.enable = true;
 	};