Clean up resolvconf

8 files changed, 6 insertions, 43 deletions

diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix
index d43aaaa..7b9132b 100755
--- a/host/Rory-nginx/configuration.nix
+++ b/host/Rory-nginx/configuration.nix
@@ -57,12 +57,6 @@
     nameservers = lib.mkOverride [ "192.168.1.1" ];
   };
 
-#  environment.etc."resolv.conf" = lib.mkOverride {
-#    text = ''
-#      nameserver 192.168.1.1
-#    '';
-#  };
-
   monitoring = {
     monitorAll = true;
     localPrometheus = true;
diff --git a/host/Rory-nginx/services/containers/draupnir-cme/root.nix b/host/Rory-nginx/services/containers/draupnir-cme/root.nix
index e4da810..0ebce9e 100755
--- a/host/Rory-nginx/services/containers/draupnir-cme/root.nix
+++ b/host/Rory-nginx/services/containers/draupnir-cme/root.nix
@@ -1,12 +1,7 @@
 { ... }:
 
 {
-  environment.etc."resolv.conf".text = ''
-    nameserver 8.8.8.8
-    nameserver 8.4.4.8
-    nameserver 1.1.1.1
-    nameserver 1.0.0.1
-  '';
+  networking.useHostResolvConf = true;
 
   networking.hosts = {
     "192.168.100.1" = [
diff --git a/host/Rory-nginx/services/containers/draupnir-fedora/root.nix b/host/Rory-nginx/services/containers/draupnir-fedora/root.nix
index e4da810..0ebce9e 100644
--- a/host/Rory-nginx/services/containers/draupnir-fedora/root.nix
+++ b/host/Rory-nginx/services/containers/draupnir-fedora/root.nix
@@ -1,12 +1,7 @@
 { ... }:
 
 {
-  environment.etc."resolv.conf".text = ''
-    nameserver 8.8.8.8
-    nameserver 8.4.4.8
-    nameserver 1.1.1.1
-    nameserver 1.0.0.1
-  '';
+  networking.useHostResolvConf = true;
 
   networking.hosts = {
     "192.168.100.1" = [
diff --git a/host/Rory-nginx/services/containers/draupnir-linux-mint/root.nix b/host/Rory-nginx/services/containers/draupnir-linux-mint/root.nix
index 2254695..2adac62 100755
--- a/host/Rory-nginx/services/containers/draupnir-linux-mint/root.nix
+++ b/host/Rory-nginx/services/containers/draupnir-linux-mint/root.nix
@@ -1,12 +1,7 @@
 { pkgs, ... }:
 
 {
-  environment.etc."resolv.conf".text = ''
-    nameserver 8.8.8.8
-    nameserver 8.4.4.8
-    nameserver 1.1.1.1
-    nameserver 1.0.0.1
-  '';
+  networking.useHostResolvConf = true;
 
   networking.hosts = {
     "192.168.100.18" = [
diff --git a/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix b/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix
index 35c4bea..daefba1 100755
--- a/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix
+++ b/host/Rory-nginx/services/containers/matrixunittests-conduit/container.nix
@@ -19,12 +19,7 @@
         ./services/nginx.nix
         ./services/conduit.nix
       ];
-      environment.etc."resolv.conf".text = ''
-        nameserver 8.8.8.8
-        nameserver 8.4.4.8
-        nameserver 1.1.1.1
-        nameserver 1.0.0.1
-      '';
+      networking.useHostResolvConf = true;
       networking.firewall = {
         enable = true;
         allowedTCPPorts = [ 80 ];
diff --git a/host/Rory-nginx/services/containers/matrixunittests/container.nix b/host/Rory-nginx/services/containers/matrixunittests/container.nix
index 1de1ddf..cbd90f8 100755
--- a/host/Rory-nginx/services/containers/matrixunittests/container.nix
+++ b/host/Rory-nginx/services/containers/matrixunittests/container.nix
@@ -17,12 +17,7 @@
         grapevine.nixosModules.default
 
       ];
-      environment.etc."resolv.conf".text = ''
-        nameserver 8.8.8.8
-        nameserver 8.4.4.8
-        nameserver 1.1.1.1
-        nameserver 1.0.0.1
-      '';
+      networking.useHostResolvConf = true;
       networking.firewall = {
         enable = true;
         allowedTCPPorts = [
diff --git a/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix
index 38049db..6be7c83 100755
--- a/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix
+++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix
@@ -18,12 +18,7 @@
         ./root.nix
         ../shared.nix
       ];
-      environment.etc."resolv.conf".text = ''
-        nameserver 8.8.8.8
-        nameserver 8.4.4.8
-        nameserver 1.1.1.1
-        nameserver 1.0.0.1
-      '';
+      networking.useHostResolvConf = true;
       networking.firewall = {
         enable = true;
         allowedTCPPorts = [ 80 ];
diff --git a/modules/base-server.nix b/modules/base-server.nix
index 7473513..1fc72f3 100755
--- a/modules/base-server.nix
+++ b/modules/base-server.nix
@@ -70,7 +70,6 @@
       "8.8.8.8"
       "8.4.4.8"
     ];
-    resolvconf.enable = true;
     defaultGateway = "192.168.1.1";
   };