default.nix

@@ -63,6 +63,8 @@ in
     import ./meta/nodes.nix
   );
 
+  dns = import ./meta/dns.nix;
+
   shells = {
     default = pkgs.mkShell {
       name = "dgnum-infra";

hive.nix

@@ -35,7 +35,7 @@ let
       keysRoot = ./keys;
     };
 
-    meta = (import ./meta).meta lib;
+    meta = (import ./meta) lib;
   };
 in
 # nodes = builtins.attrNames metadata.nodes;

meta/default.nix

@@ -2,24 +2,16 @@
 # Metadata for the nodes. You can add custom attributes, they are
 # accessible through the specialArg meta in the config.
 
-let
+lib:
-  dns = args: import ./dns.nix (args // { inherit meta; });
 
-  meta =
+(lib.evalModules {
-    lib:
+  modules = [
-    (lib.evalModules {
+    ./options.nix
-      modules = [
+    {
-        ./options.nix
+      network = import ./network.nix;
-        {
+      nodes = import ./nodes.nix;
-          network = import ./network.nix;
+      organization = import ./organization.nix;
-          nodes = import ./nodes.nix;
+    }
-          organization = import ./organization.nix;
+  ];
-        }
+  class = "dgnumMeta";
-      ];
+}).config
-      class = "dgnumMeta";
-    }).config;
-in
-
-{
-  inherit dns meta;
-}

meta/dns.nix

@@ -1,35 +1,21 @@
-{
+{ lib, dns, ... }:
-  lib,
-  meta,
-  dns,
-  ...
-}:
 
 let
+  inherit (lib) mapAttrs' nameValuePair;
   inherit (lib.extra) fuseAttrs mapSingleFuse;
 
   inherit (dns.lib.combinators) mx spf ttl;
 
-  meta' = meta lib;
+  meta = (import ./.) lib;
 
   mkCNAME = host: { CNAME = [ host ]; };
 
-  mkRecord =
+  mkHosted = server: mapSingleFuse (_: mkCNAME "${server}.${meta.nodes.${server}.site}.infra");
-    host:
-    let
-      net = meta'.network.${host};
-    in
-    {
-      A = net.addresses.publicV4;
-      AAAA = net.addresses.publicV6;
-    };
-
-  mkHosted = server: mapSingleFuse (_: mkCNAME "${server}.${meta'.nodes.${server}.site}.infra");
 
   cnames = builtins.mapAttrs (_: to: { CNAME = [ to ]; }) {
-    dev = "dev.pages.codeberg.page.";
+    "dev" = "dev.pages.codeberg.page.";
-    irc = "public.p.lahfa.xyz.";
+    "irc" = "public.p.lahfa.xyz.";
-    webmail = "kurisu.dual.lahfa.xyz.";
+    "webmail" = "kurisu.dual.lahfa.xyz.";
 
     "*.cal" = "cal.dgnum.eu.";
     "retired" = "web-static";
@@ -108,10 +94,6 @@ let
     )
   );
 
-  infra.subdomains =
-    builtins.mapAttrs (_: nodes: { subdomains = mapSingleFuse mkRecord nodes; })
-      meta.infra;
-
   kurisuDKIM = [
     {
       selector = "kurisu";
@@ -164,12 +146,27 @@ in
       };
     }
     // {
-      infra = infra // {
+      infra = {
         MX = map (ttl 3600) [ (mx.mx 10 "kurisu.lahfa.xyz.") ];
 
         TXT = [ (spf.strict [ "a:kurisu.lahfa.xyz" ]) ];
         DMARC = [ { p = "none"; } ];
         DKIM = kurisuDKIM;
+
+        subdomains =
+          mapAttrs'
+            (
+              host:
+              { site, ... }:
+              nameValuePair "${host}.${site}" (
+                with meta.network.${host}.addresses;
+                {
+                  A = ipv4;
+                  AAAA = ipv6;
+                }
+              )
+            )
+            meta.nodes;
       };
     };
 }

meta/options.nix

@@ -240,7 +240,7 @@ in
                   ipv4 = builtins.filter (ip: builtins.substring 0 7 ip != "192.168") (
                     getAddresses "ipv4" (builtins.attrValues config.interfaces)
                   );
-                  ipv6 = builtins.filter (_: true) ((getAddresses "ipv4") (builtins.attrValues config.interfaces));
+                  ipv6 = builtins.filter (_: true) ((getAddresses "ipv6") (builtins.attrValues config.interfaces));
                 };
               };
           }

meta/verify.nix

@@ -3,4 +3,4 @@ let
   pkgs = import sources.nixpkgs { };
 in
 
-builtins.deepSeq ((import ./.).meta pkgs.lib) { }
+builtins.deepSeq ((import ./.) pkgs.lib) { }