fix(substituters): Allow all paths from the infra cache

machines/nixos/storage01/snix-cache/cache-settings.nix

@@ -1,18 +1,39 @@
 # SPDX-FileCopyrightText: 2024 Maurice Debray <maurice.debray@dgnum.eu>
+# SPDX-FileCopyrightText: 2025 Tom Hubrecht <tom.hubrecht@dgnum.eu>
 #
 # SPDX-License-Identifier: EUPL-1.2
 
+{ lib, ... }:
+
 let
+  inherit (lib)
+    attrValues
+    catAttrs
+    concatLists
+    getAttrs
+    isAttrs
+    ;
+
   cache-info = {
     infra = {
-      public-key = "infra.snix-store.dgnum.eu-1:8CAY64o3rKjyw2uA5mzr/aTzstnc+Uj4g8OC6ClG1m8=";
+      keys = [
+        "infra.snix-store.dgnum.eu-1:8CAY64o3rKjyw2uA5mzr/aTzstnc+Uj4g8OC6ClG1m8="
+        "infra.tvix-store.dgnum.eu-1:8CAY64o3rKjyw2uA5mzr/aTzstnc+Uj4g8OC6ClG1m8="
+      ];
       url = "https://snix-store.dgnum.eu/infra";
     };
   };
 in
 
-{ caches }:
+caches':
+
+let
+  caches = if isAttrs caches' then caches'.caches else caches';
+
+  selected = attrValues (getAttrs caches cache-info);
+in
+
 {
-  substituters = builtins.map (cache: cache-info.${cache}.url) caches;
-  trusted-public-keys = builtins.map (cache: cache-info.${cache}.public-key) caches;
+  substituters = catAttrs "url" selected;
+  trusted-public-keys = concatLists (catAttrs "keys" selected);
 }