From ce77837769c8db391bc685140f292fd4c713f680 Mon Sep 17 00:00:00 2001
From: Niten <niten@fudo.org>
Date: Tue, 2 Mar 2021 00:08:14 +0000
Subject: [PATCH] Arg that's frustrating...why no NAT?

---
 config/hosts/clunk.nix     | 4 ++--
 lib/fudo/hosts.nix         | 5 +++--
 lib/fudo/local-network.nix | 7 +++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/hosts/clunk.nix b/config/hosts/clunk.nix
index 70cdd14..1e7056f 100644
--- a/config/hosts/clunk.nix
+++ b/config/hosts/clunk.nix
@@ -29,7 +29,7 @@ in {
     recursive-resolver = "${primary-ip} port 5353";
     network = site.network;
     dhcp-dynamic-network = site.dynamic-network;
-    search-domains = [ domain-name "selby.ca" ];
+    search-domains = [ "selby.ca" ];
     enable-reverse-mappings = true;
     network-definition = config.fudo.networks."rus.selby.ca";
   };
@@ -42,7 +42,7 @@ in {
     };
 
     interfaces = {
-      enp1s0.useDHCP = false;
+      # enp1s0.useDHCP = false;
       enp2s0.useDHCP = false;
       enp3s0.useDHCP = false;
       enp4s0.useDHCP = false;
diff --git a/lib/fudo/hosts.nix b/lib/fudo/hosts.nix
index 0465608..4454f2e 100644
--- a/lib/fudo/hosts.nix
+++ b/lib/fudo/hosts.nix
@@ -108,8 +108,9 @@ in {
     networking = {
       hostName = config.instance.hostname;
       nameservers = site.nameservers;
-      defaultGateway = site.gateway-v4;
-      defaultGateway6 = site.gateway-v6;
+      # This will cause a loop on the gateway itself
+      #defaultGateway = site.gateway-v4;
+      #defaultGateway6 = site.gateway-v6;
 
       # Necessary to ensure that Kerberos and Avahi both work. Kerberos needs
       # the fqdn of the host, whereas Avahi wants just the simple hostname.`
diff --git a/lib/fudo/local-network.nix b/lib/fudo/local-network.nix
index baf2d20..a806a6f 100644
--- a/lib/fudo/local-network.nix
+++ b/lib/fudo/local-network.nix
@@ -112,10 +112,9 @@ in {
           option routers ${cfg.gateway};
           option domain-name-servers ${concatStringsSep " " cfg.dns-servers};
           option domain-name "${cfg.domain}";
-          option domain-search ${
-            join-lines
-            (map (dom: ''"${dom}"'') ([ cfg.domain ] ++ cfg.search-domains))
-          };
+          option domain-search "${
+            concatStringsSep " " ([ cfg.domain ] ++ cfg.search-domains)
+          }";
           range ${ip.networkMinIp cfg.dhcp-dynamic-network} ${
             ip.networkMaxButOneIp cfg.dhcp-dynamic-network
           };