feat: Add processDomainsFirst option to DNS module for flexible CoreDNS configuration

hosts/architect/dns.nix

@@ -5,6 +5,7 @@
   pepe.core.dns = {
     enable = true;
     nextDNSId = "d65174";
+    processDomainsFirst = true;
     extraDomains = {
       "architect.devs.giugl.io" = { 
         dnsInterfaces = [ "lan" "tailscale" ]; 

modules/core/dns.nix

@@ -18,6 +18,12 @@ in
       description = "NextDNS ID for DNS over TLS.";
     };
 
+    processDomainsFirst = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Process all domains first, then add device views just once.";
+    };
+
     extraDomains = mkOption {
       type = types.attrsOf (types.submodule {
         options = {
@@ -37,16 +43,38 @@ in
     services.coredns = {
       enable = true;
       config = let
-        generateCoreDNSConfig = domains:
+        # Function to generate domain-specific configurations
-          let
+        generateDomainConfig = domain: conf: ifaceName:
-            generateForDomain = domain: conf:
-              concatMapStrings
-                (ifaceName:
           let
             iface = config.pepe.core.network.interfaces.${ifaceName};
             serverIP = iface.devices.server.address or "127.0.0.1";
             interfaceNet = iface.net;
-                    deviceViews = concatMapStrings
+          in
+          ''
+            ${domain} {
+              view ${ifaceName} {
+                expr incidr(client_ip(), '${interfaceNet}')
+              }
+
+              template IN A ${domain} {
+                answer "${domain}. 60 IN A ${serverIP}"
+              }
+
+              template IN HTTPS ${domain} {
+                answer "${domain}. 60 IN HTTPS 1 . ipv4hint=\"${serverIP}\""
+              }
+
+              cache
+              log
+            }
+          '';
+
+        # Function to generate device views for an interface
+        generateDeviceViews = ifaceName:
+          let
+            iface = config.pepe.core.network.interfaces.${ifaceName};
+          in
+          concatMapStrings
             ({ name, device }:
               let
                 deviceIP = device.address;
@@ -68,24 +96,38 @@ in
               (name: device: { inherit name device; })
               iface.devices
             );
+
+        # Collect all interfaces used across all domains
+        allInterfaces = lib.unique (lib.flatten 
+          (lib.mapAttrsToList 
+            (_: conf: conf.dnsInterfaces) 
+            (config.pepe.core.vhost.hosts // cfg.extraDomains)
+          ));
+
+        # Generate all device views once
+        allDeviceViews = if cfg.processDomainsFirst
+          then concatMapStrings generateDeviceViews allInterfaces
+          else "";
+
+        # Function to generate configurations for all domains
+        generateCoreDNSConfig = domains:
+          let
+            generateForDomain = domain: conf:
+              if cfg.processDomainsFirst then
+                # Just generate domain configs without device views
+                concatMapStrings
+                  (ifaceName: generateDomainConfig domain conf ifaceName)
+                  conf.dnsInterfaces
+              else
+                # Original behavior: interleave domains and device views
+                concatMapStrings
+                  (ifaceName:
+                    let
+                      domainConfig = generateDomainConfig domain conf ifaceName;
+                      deviceViews = generateDeviceViews ifaceName;
                     in
                     ''
-                    ${domain} {
+                      ${domainConfig}
-                      view ${ifaceName} {
-                        expr incidr(client_ip(), '${interfaceNet}')
-                      }
-
-                      template IN A ${domain} {
-                        answer "${domain}. 60 IN A ${serverIP}"
-                      }
-
-                      template IN HTTPS ${domain} {
-                        answer "${domain}. 60 IN HTTPS 1 . ipv4hint=\"${serverIP}\""
-                      }
-
-                      cache
-                      log
-                    }
                       
                       ${deviceViews}
                     ''
@@ -98,6 +140,8 @@ in
       in ''
         ${generateCoreDNSConfig allDomains}
         
+        ${allDeviceViews}
+
         . {
           forward . tls://45.90.28.77 tls://45.90.30.77 {
               tls_servername lan-${cfg.nextDNSId}.dns.nextdns.io