about summary refs log tree commit diff
path: root/machines/devhell
diff options
context:
space:
mode:
authordevhell <devhell@mailfresser.de>2018-05-13 20:05:52 +0100
committerdevhell <devhell@mailfresser.de>2018-05-13 20:05:52 +0100
commit5b54095f2005daff0806f005c5a2b1d221097f46 (patch)
treeca7d5c22dc2c1c73550a53234aaa4504b0982acb /machines/devhell
parent572f728d4191f4c2be0859792e85b92dc1f3f7a1 (diff)
machines/titan: Replace fallbackDns
The original idea was to have globally reachable nameservers as
fallback, but really this isn't what I wanted. I want to have
nameservers additionally to the ones provided by DHCP, but in case the
one provided by DHCP does not deliver the resolve, the other primary
nameservers here will be queried instead.
Diffstat (limited to 'machines/devhell')
-rw-r--r--machines/devhell/titan.nix7
1 files changed, 2 insertions, 5 deletions
diff --git a/machines/devhell/titan.nix b/machines/devhell/titan.nix
index d8dd30c6..9433da9d 100644
--- a/machines/devhell/titan.nix
+++ b/machines/devhell/titan.nix
@@ -53,8 +53,8 @@
   # FIXME Check if this is still necessary in the future
   systemd.services.systemd-networkd-wait-online.enable = false;
 
-  # XXX Kind of a hack to work around the issue of networkd not honoring networking.nameservers
-  systemd.network.networks."99-main".dhcpConfig.UseDNS = false;
+  # XXX Ensure that these are added in addition to the DHCP proviced DNS servers
+  systemd.network.networks."99-main".dns = [ "1.1.1.1" "8.8.8.8" "8.8.4.4" ];
 
   networking = {
     hostName = "titan";
@@ -94,9 +94,6 @@
       drivers = [ pkgs.gutenprint pkgs.hplip pkgs.cups-brother-hl1110 ];
     };
     dnscrypt-proxy.enable = false;
-    resolved = {
-      fallbackDns = [ "1.1.1.1" "8.8.8.8" "8.8.4.4" ];
-    };
   };
 
   services.acpid = {