Fix octodns setup

dns/common.nix

@@ -69,7 +69,6 @@ let
 in
 # }}}
 {
-  satellite.dns.domain = "moonythm.dev";
   satellite.dns.records = lib.flatten [
     (ghPage "doffycup")
     (ghPage "erratic-gate")

dns/pkgs.nix

@@ -1,26 +1,38 @@
-{ pkgs, self, ... }: rec {
+{ pkgs, self, ... }:
+rec {
   octodns-zones =
     let
-      nixosConfigModules = pkgs.lib.mapAttrsToList
+      nixosConfigModules = pkgs.lib.mapAttrsToList (
-        (_: current: { satellite.dns = current.config.satellite.dns; })
+        key: current:
-        self.nixosConfigurations;
+        # The iso image doesn't do any dns stuff
+        if key == "iso" then
+          { }
+        else
+          # Copy over all dns records
+          { satellite.dns = current.config.satellite.dns; }
+      ) self.nixosConfigurations;
 
       evaluated = pkgs.lib.evalModules {
-        specialArgs = { inherit pkgs; };
+        specialArgs = {
+          inherit pkgs;
+        };
         modules = [
           ../modules/nixos/dns.nix
           ../modules/common/octodns.nix
           ./common.nix
-        ]
+        ] ++ nixosConfigModules;
-        ++ nixosConfigModules;
       };
     in
     evaluated.config.satellite.dns.octodns;
-  octodns-sync =
+
-    pkgs.symlinkJoin {
+  octodns-sync = pkgs.symlinkJoin {
     name = "octodns-sync";
     paths = [ self.packages.${pkgs.system}.octodns ];
-      buildInputs = [ pkgs.makeWrapper pkgs.yq ];
+    buildInputs = [
+      pkgs.makeWrapper
+      pkgs.yq
+    ];
+
     postBuild = ''
       cat ${./octodns.yaml} | yq '.providers.zones.directory="${octodns-zones}"' > $out/config.yaml
       wrapProgram $out/bin/octodns-sync \
@@ -34,4 +46,3 @@
     '';
   };
 }
-

flake.lock

@@ -1475,11 +1475,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1724819573,
+        "lastModified": 1728492678,
-        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
+        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
+        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
         "type": "github"
       },
       "original": {
@@ -1632,11 +1632,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1720691131,
+        "lastModified": 1728500571,
-        "narHash": "sha256-CWT+KN8aTPyMIx8P303gsVxUnkinIz0a/Cmasz1jyIM=",
+        "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a046c1202e11b62cbede5385ba64908feb7bfac4",
+        "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0",
         "type": "github"
       },
       "original": {

flake.nix

@@ -104,7 +104,7 @@
         in
         myPkgs
         // {
-          octodns = upkgs.octodns.withProviders (ps: [ myPkgs.octodns-cloudflare ]);
+          octodns = myPkgs.octodns.withProviders (ps: [ myPkgs.octodns-cloudflare ]);
         }
         // (import ./dns/pkgs.nix) { inherit pkgs self system; }
       );

modules/common/octodns.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
   format = pkgs.formats.yaml { };
   cfg = config.satellite.dns;
@@ -12,32 +17,29 @@ in
   config.satellite.dns.octodns =
     let
       grouped = builtins.groupBy (entry: entry.zone) cfg.records;
-      cpLines = lib.mapAttrsToList
+      cpLines = lib.mapAttrsToList (
-        (zone: group:
+        zone: group:
         let
           grouped = builtins.groupBy (entry: entry.at) group;
-            contents = lib.mapAttrs
+          contents = lib.mapAttrs (
-              (at: entries: lib.lists.forEach entries
+            at: entries:
-                (entry:
+            lib.lists.forEach entries (
+              entry:
               let
                 content =
-                      if builtins.typeOf entry.value == "list"
+                  if builtins.typeOf entry.value == "list" then
-                      then { values = entry.value; }
+                    { values = entry.value; }
-                      else { inherit (entry) value; };
+                  else
-                    cloudflare =
+                    { inherit (entry) value; };
-                      if entry.enableCloudflareProxy then {
+                cloudflare = if entry.enableCloudflareProxy then { octodns.cloudflare.proxied = true; } else { };
-                        octodns.cloudflare.proxied = true;
-                      } else { };
               in
-                  { inherit (entry) ttl type; }
+              { inherit (entry) ttl type; } // content // cloudflare
-                  // content // cloudflare
+            )
-                ))
+          ) grouped;
-              grouped;
           file = format.generate "${zone}.yaml" contents;
         in
         "cp ${file} $out/${zone}.yaml"
-        )
+      ) grouped;
-        grouped;
     in
     pkgs.runCommand "octodns-zones" { } ''
       mkdir $out

modules/nixos/cloudflared.nix

@@ -85,6 +85,7 @@ in
           at = subdomain;
           zone = cfg.domain;
           value = "${cfg.tunnel}.cfargotunnel.com.";
+          enableCloudflareProxy = true;
         };
     in
     lib.attrsets.mapAttrsToList (_: mkDnsRecord) cfg.at;

modules/nixos/dns.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
   format = pkgs.formats.yaml { };
   cfg = config.satellite.dns;
@@ -13,7 +18,10 @@ in
     records = lib.mkOption {
       description = "List of records to create";
       default = [ ];
-      type = lib.types.listOf (lib.types.submodule ({ config, ... }: {
+      type = lib.types.listOf (
+        lib.types.submodule (
+          { config, ... }:
+          {
             options = {
               at = lib.mkOption {
                 description = "Subdomain to use for entry";
@@ -27,7 +35,13 @@ in
               };
 
               type = lib.mkOption {
-            type = lib.types.enum [ "A" "AAAA" "TXT" "CNAME" "MX" ];
+                type = lib.types.enum [
+                  "A"
+                  "AAAA"
+                  "TXT"
+                  "CNAME"
+                  "MX"
+                ];
                 description = "The type of the DNS record";
               };
 
@@ -51,9 +65,12 @@ in
               enableCloudflareProxy = lib.mkEnableOption "proxying using cloudflare";
             };
 
-        config.value = lib.mkIf (config.type == "CNAME" && config.to != null)
+            config.value = lib.mkIf (
-          "${config.to}.${config.zone}.";
+              config.type == "CNAME" && config.to != null
-      }));
+            ) "${config.to}.${config.zone}.";
+          }
+        )
+      );
     };
   };
 }

modules/nixos/nginx.nix

@@ -1,5 +1,6 @@
 { config, lib, ... }:
-let cfg = config.satellite.nginx;
+let
+  cfg = config.satellite.nginx;
 in
 {
   options.satellite.nginx = {
@@ -11,7 +12,10 @@ in
 
     at = lib.mkOption {
       description = "Per-subdomain nginx configuration";
-      type = lib.types.attrsOf (lib.types.submodule ({ name, config, ... }: {
+      type = lib.types.attrsOf (
+        lib.types.submodule (
+          { name, config, ... }:
+          {
             options.subdomain = lib.mkOption {
               description = ''
                 Subdomain to use for host generation.
@@ -46,53 +50,64 @@ in
               type = lib.types.nullOr lib.types.path;
               default = null;
             };
-      }));
+          }
+        )
+      );
       default = { };
     };
   };
 
   config = {
     assertions =
-      let assertSingleTarget = config:
+      let
-        {
+        assertSingleTarget = config: {
           assertion = (config.port == null) == (config.files != null);
           message = ''
             Precisely one of the options 'satellite.nginx.at.${config.subdomain}.port'
             and 'satellite.nginx.at.${config.subdomain}.files' must be specified.
           '';
         };
-      in lib.mapAttrsToList (_: assertSingleTarget) cfg.at;
+      in
+      lib.mapAttrsToList (_: assertSingleTarget) cfg.at;
 
     services.nginx.virtualHosts =
-      let mkNginxConfig = { host, port, files, ... }: {
+      let
-        name = host;
+        mkNginxConfig = args: {
+          name = args.host;
           value =
-          let extra =
+            let
-            if port != null then {
+              extra =
+                if args.port != null then
+                  {
                     locations."/" = {
-                proxyPass = "http://localhost:${toString port}";
+                      proxyPass = "http://localhost:${toString args.port}";
                       proxyWebsockets = true;
                     };
                   }
-            else {
+                else
-              root = files;
+                  { root = args.files; };
-            };
             in
             {
               enableACME = true;
               acmeRoot = null;
               forceSSL = true;
-          } // extra;
+            }
+            // extra;
         };
-      in lib.attrsets.mapAttrs' (_: mkNginxConfig) cfg.at;
+      in
+      lib.attrsets.mapAttrs' (_: mkNginxConfig) cfg.at;
 
     satellite.dns.records =
-      let mkDnsRecord = { subdomain, ... }: {
+      let
+        mkDnsRecord =
+          { subdomain, ... }:
+          {
             type = "CNAME";
             zone = cfg.domain;
             at = subdomain;
-        to = "${config.networking.hostName}.${cfg.domain}.";
+            to = config.networking.hostName;
           };
-      in lib.attrsets.mapAttrsToList (_: mkDnsRecord) cfg.at;
+      in
+      lib.attrsets.mapAttrsToList (_: mkDnsRecord) cfg.at;
   };
 }

pkgs/default.nix

@@ -1,12 +1,29 @@
 # Custom packages, that can be defined similarly to ones from nixpkgs
 # You can build them using 'nix build .#example' or (legacy) 'nix-build -A example'
 
-{ pkgs ? (import ../nixpkgs.nix) { }, upkgs ? pkgs, ... }:
-let plymouthThemes = pkgs.callPackage (import ./plymouth-themes.nix) { }; in
 {
-  # example = pkgs.callPackage (import ./example.nix) {};
+  pkgs ? (import ../nixpkgs.nix) { },
+  upkgs ? pkgs,
+  ...
+}:
+let
+  plymouthThemes = pkgs.callPackage (import ./plymouth-themes.nix) { };
+in
+rec {
+  plymouthThemeCutsAlt = plymouthThemes.cuts_alt;
   vimclip = pkgs.callPackage (import ./vimclip.nix) { };
   homer = pkgs.callPackage (import ./homer.nix) { };
-  octodns-cloudflare = pkgs.python3Packages.callPackage (import ./octodns-cloudflare.nix) { };
+
-  plymouthThemeCutsAlt = plymouthThemes.cuts_alt;
+  octodns = pkgs.octodns.overrideAttrs (_: {
+    version = "unstable-2024-10-08";
+    src = pkgs.fetchFromGitHub {
+      owner = "octodns";
+      repo = "octodns";
+      rev = "a1456cb1fcf00916ca06b204755834210a3ea9cf";
+      sha256 = "192hbxhb0ghcbzqy3h8q194n4iy7bqfj9ra9qqjff3x2z223czxb";
+    };
+  });
+  octodns-cloudflare = pkgs.python3Packages.callPackage (import ./octodns-cloudflare.nix) {
+    inherit octodns;
+  };
 }

pkgs/octodns-cloudflare.nix

@@ -1,18 +1,18 @@
-{ lib
+{
-, buildPythonPackage
+  buildPythonPackage,
-, fetchFromGitHub
+  fetchFromGitHub,
-, octodns
+  octodns,
-, pytestCheckHook
+  pytestCheckHook,
-, pythonOlder
+  pythonOlder,
-, dnspython
+  dnspython,
-, setuptools
+  setuptools,
-, requests
+  requests,
-, requests-mock
+  requests-mock,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "octodns-cloudflare";
-  version = "unstable-2024-05-31";
+  version = "unstable-2024-10-08";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,13 +20,11 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "octodns";
     repo = "octodns-cloudflare";
-    rev = "3c01938e280767f433eb276a75d6b02c152c02af";
+    rev = "61a4b404b15c0c14cb18d36b48b834490e743319";
-    sha256 = "1dnvyvf6mlpqcsrj11192li2mhqfs8w6pvaqmsy3jsqjqczmgmf5";
+    sha256 = "0kcih4dxgl9ihh22j6d7dbd0d1ylrjp6f60w1p5gzyini1c0a0x1";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs = [ setuptools ];
-    setuptools
-  ];
 
   propagatedBuildInputs = [
     octodns