chore(deps): lock file maintenance

flake.lock

@@ -34,11 +34,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728385805,
-        "narHash": "sha256-mUd38b0vhB7yzgAjNOaFz7VY9xIVzlbn3P2wjGBcVV0=",
+        "lastModified": 1729382845,
+        "narHash": "sha256-REiWck1zIOnZIgGmmOWfwvkQw1f4UrBsxxOSKVSAG4w=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "48b50b3b137be5cfb9f4d006835ce7c3fe558ccc",
+        "rev": "a001f44cfc47164839eb61c6b1e7f4288813f7e8",
         "type": "github"
       },
       "original": {
@@ -113,11 +113,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728726232,
-        "narHash": "sha256-8ZWr1HpciQsrFjvPMvZl0W+b0dilZOqXPoKa2Ux36bc=",
+        "lastModified": 1729459288,
+        "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d57112db877f07387ce7104b5ac346ede556d2d7",
+        "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e",
         "type": "github"
       },
       "original": {
@@ -128,11 +128,11 @@
     },
     "impermanence": {
       "locked": {
-        "lastModified": 1727649413,
-        "narHash": "sha256-FA53of86DjFdeQzRDVtvgWF9o52rWK70VHGx0Y8fElQ=",
+        "lastModified": 1729068498,
+        "narHash": "sha256-C2sGRJl1EmBq0nO98TNd4cbUy20ABSgnHWXLIJQWRFA=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "d0b38e550039a72aff896ee65b0918e975e6d48e",
+        "rev": "e337457502571b23e449bf42153d7faa10c0a562",
         "type": "github"
       },
       "original": {
@@ -144,11 +144,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1728729581,
-        "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=",
+        "lastModified": 1729455275,
+        "narHash": "sha256-THqzn/7um3oMHUEGXyq+1CJQE7EogwR3HjLMNOlhFBE=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806",
+        "rev": "9fcf30fccf8435f6390efec4a4d38e69c2268a36",
         "type": "github"
       },
       "original": {
@@ -159,11 +159,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728627514,
-        "narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=",
+        "lastModified": 1729181673,
+        "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c505ebf777526041d792a49d5f6dd4095ea391a7",
+        "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3",
         "type": "github"
       },
       "original": {
@@ -175,11 +175,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1729256144,
-        "narHash": "sha256-Zm+tbIRZ79VJBUJ6/qeu51fgAh46bBENlCRENGeNwrY=",
+        "lastModified": 1729256301,
+        "narHash": "sha256-L2xuJAuNE6MIQ+s3ddGqDuWHYThYRF3nKlwW8OrXy9I=",
         "owner": "JakeHillion",
         "repo": "nixpkgs",
-        "rev": "98dfa7f7d526f5a3551b7579671e8032587e17f6",
+        "rev": "af3d384738afdb1b12abe8c6755215e8cb3971d4",
         "type": "github"
       },
       "original": {

hosts/phoenix.st.ts.hillion.co.uk/default.nix

@@ -78,6 +78,14 @@ in
       extraRepos = [ "https://gitea.hillion.co.uk/JakeHillion/nixos.git" ];
     };
 
+    ## Downloads
+    custom.services.downloads = {
+      metadataPath = "/${zpool_name}/downloads/metadata";
+      downloadCachePath = "/${zpool_name}/downloads/torrents";
+      filmsPath = "/${zpool_name}/media/films";
+      tvPath = "/${zpool_name}/media/tv";
+    };
+
     ## Networking
     networking = {
       interfaces.enp4s0.name = "eth0";

modules/locations.nix

@@ -20,7 +20,7 @@ in
       custom.locations.locations = {
         services = {
           authoritative_dns = [ "boron.cx.ts.hillion.co.uk" ];
-          downloads = "";
+          downloads = "phoenix.st.ts.hillion.co.uk";
           gitea = "boron.cx.ts.hillion.co.uk";
           homeassistant = "microserver.home.ts.hillion.co.uk";
           mastodon = "";

modules/services/authoritative_dns.nix

@@ -33,16 +33,19 @@ in
               86400 NS ns1.hillion.co.uk.
 
               ca                    21600 CNAME sodium.pop.ts.hillion.co.uk.
+              restic                21600 CNAME ${config.custom.locations.locations.services.restic}.
+              prometheus            21600 CNAME ${config.custom.locations.locations.services.prometheus}.
+
+              deluge.downloads      21600 CNAME ${config.custom.locations.locations.services.downloads}.
+              prowlarr.downloads    21600 CNAME ${config.custom.locations.locations.services.downloads}.
+              radarr.downloads      21600 CNAME ${config.custom.locations.locations.services.downloads}.
+              sonarr.downloads      21600 CNAME ${config.custom.locations.locations.services.downloads}.
+
+              graphs.router.home    21600 CNAME router.home.ts.hillion.co.uk.
+              zigbee2mqtt.home      21600 CNAME router.home.ts.hillion.co.uk.
+
               charlie.kvm           21600 CNAME router.home.ts.hillion.co.uk.
               hammer.kvm            21600 CNAME router.home.ts.hillion.co.uk.
-              deluge.downloads      21600 CNAME tywin.storage.ts.hillion.co.uk.
-              graphs.router.home    21600 CNAME router.home.ts.hillion.co.uk.
-              prowlarr.downloads    21600 CNAME tywin.storage.ts.hillion.co.uk.
-              radarr.downloads      21600 CNAME tywin.storage.ts.hillion.co.uk.
-              restic                21600 CNAME ${config.custom.locations.locations.services.restic}.
-              sonarr.downloads      21600 CNAME tywin.storage.ts.hillion.co.uk.
-              zigbee2mqtt.home      21600 CNAME router.home.ts.hillion.co.uk.
-              prometheus            21600 CNAME ${config.custom.locations.locations.services.prometheus}.
 
             '' + (makeRecords "A" config.custom.dns.authoritative.ipv4.uk.co.hillion.ts) + "\n\n" + (makeRecords "AAAA" config.custom.dns.authoritative.ipv6.uk.co.hillion.ts);
         };

modules/services/downloads.nix

@@ -24,6 +24,12 @@ in
   };
 
   config = lib.mkIf cfg.enable {
+    age.secrets."wireguard/downloads".file = ../../secrets/wireguard/downloads.age;
+    age.secrets."deluge/auth" = {
+      file = ../../secrets/deluge/auth.age;
+      owner = "deluge";
+    };
+
     services.caddy = {
       enable = true;
 
@@ -45,12 +51,6 @@ in
 
 
     ## Wireguard
-    age.secrets."wireguard/downloads".file = ../../secrets/wireguard/downloads.age;
-    age.secrets."deluge/auth" = {
-      file = ../../secrets/deluge/auth.age;
-      owner = "deluge";
-    };
-
     networking.wireguard.interfaces."downloads" = {
       privateKeyFile = config.age.secrets."wireguard/downloads".path;
       ips = [ "10.2.0.2/32" ];

secrets/secrets.nix

@@ -110,10 +110,10 @@ in
   "mqtt/homeassistant.age".publicKeys = jake_users ++ [ ];
 
   # Wireguard Secrets
-  "wireguard/downloads.age".publicKeys = jake_users ++ [ ];
+  "wireguard/downloads.age".publicKeys = jake_users ++ [ ts.st.phoenix ];
 
   # Deluge Secrets
-  "deluge/auth.age".publicKeys = jake_users ++ [ ];
+  "deluge/auth.age".publicKeys = jake_users ++ [ ts.st.phoenix ];
 
   # Gitea Secrets
   "gitea/lfs_jwt_secret.age".publicKeys = jake_users ++ [ ts.cx.boron ];