all repos — nixfiles @ eea10211491653c088c09fca3412e797a6e5d6ef

System and user configuration, managed by nix and home-manager

move dns providers to data

Alin
commit

eea10211491653c088c09fca3412e797a6e5d6ef

parent

f83561661b7c4c1541724789bb306ff2c041a20c

2 files changed, 22 insertions(+), 22 deletions(-)

changed files
M data/default.nix → data/default.nix
@@ -52,4 +52,25 @@ // {
       extraHostNames = canon name machine.domains;
     }
   ) machines;
+
+  dnsProviders = {
+    quad9 = {
+      hostname = "dns.quad9.net";
+      addresses = [
+        "2620:fe::fe"
+        "2620:fe::9"
+        "9.9.9.9"
+        "149.112.112.112"
+      ];
+    };
+    dnssb = {
+      hostname = "dot.sb";
+      addresses = [
+        "2a09::"
+        "2a11::"
+        "45.11.45.11"
+        "185.222.222.222"
+      ];
+    };
+  };
 }
M system/roles/router.nix → system/roles/router.nix
@@ -10,7 +10,7 @@ lans = config.networking.nat.internalInterfaces;
   lan = builtins.head lans;
 
   inherit (config.networking) domain hostName fqdn;
-  inherit (import ../../data) ulaPrefix;
+  inherit (import ../../data) ulaPrefix dnsProviders;
   netlib = import ../../lib/net.nix { inherit lib; };
 
   wanPrefixLen = 56;

@@ -20,27 +20,6 @@ hostname = "modem";
 
     deviceAddr = "192.168.100.1";
     ourAddr = "192.168.100.10";
-  };
-
-  dnsProviders = {
-    quad9 = {
-      hostname = "dns.quad9.net";
-      addresses = [
-        "2620:fe::fe"
-        "2620:fe::9"
-        "9.9.9.9"
-        "149.112.112.112"
-      ];
-    };
-    dnssb = {
-      hostname = "dot.sb";
-      addresses = [
-        "2a09::"
-        "2a11::"
-        "45.11.45.11"
-        "185.222.222.222"
-      ];
-    };
   };
 
   allProviders = lib.attrValues dnsProviders;