From b338eeed6a661eb7f6b88c19eecec177708c10d2 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom@hubrecht.ovh>
Date: Mon, 4 Dec 2023 12:36:31 +0100
Subject: [PATCH] fix(network): Add dns servers on the main interface

---
 modules/dgn-network.nix | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/modules/dgn-network.nix b/modules/dgn-network.nix
index 7521023..951e989 100644
--- a/modules/dgn-network.nix
+++ b/modules/dgn-network.nix
@@ -1,16 +1,18 @@
 { config, lib, meta, name, ... }:
 
 let
-  inherit (lib)
-    mapAttrs'
-    mkEnableOption
-    mkIf
-    optionalAttrs;
+  inherit (lib) mapAttrs' mkEnableOption mkIf optionalAttrs;
 
   net = meta.network.${name};
 
-  mkAddress = { address, prefixLength, ... }: "${address}/${builtins.toString prefixLength}";
-  mkRoute = gateway: { routeConfig = { Gateway = gateway; GatewayOnLink = true; }; };
+  mkAddress = { address, prefixLength, ... }:
+    "${address}/${builtins.toString prefixLength}";
+  mkRoute = gateway: {
+    routeConfig = {
+      Gateway = gateway;
+      GatewayOnLink = true;
+    };
+  };
 
   mkInterface = interface: net: {
     name = "10-${interface}";
@@ -19,15 +21,29 @@ let
       address = builtins.map mkAddress (net.ipv4 ++ net.ipv6);
       routes = builtins.map mkRoute net.gateways;
 
+      # Add default DNS servers
+      dns = [
+        "1.1.1.1#cloudflare-dns.com"
+        "8.8.8.8#dns.google"
+        "1.0.0.1#cloudflare-dns.com"
+        "8.8.4.4#dns.google"
+        "[2606:4700:4700::1111]#cloudflare-dns.com"
+        "[2001:4860:4860::8888]#dns.google"
+        "[2606:4700:4700::1001]#cloudflare-dns.com"
+        "[2001:4860:4860::8844]#dns.google"
+      ];
+
       networkConfig = optionalAttrs (net ? DHCP) { inherit (net) DHCP; };
     };
   };
 
   cfg = config.dgn-network;
-in
 
-{
-  options.dgn-network.enable = mkEnableOption "automatic network configuration based on metadata" // { default = true; };
+in {
+  options.dgn-network.enable =
+    mkEnableOption "automatic network configuration based on metadata" // {
+      default = true;
+    };
 
   config = mkIf cfg.enable {
     networking = {