Merge remote-tracking branch 'prism/lassulus'

2 files changed, 27 insertions, 14 deletions

diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix
index ce3c63f28..b0b822780 100644
--- a/shared/1systems/wolf.nix
+++ b/shared/1systems/wolf.nix
@@ -32,7 +32,17 @@ in
     security = import <secrets/grafana_security.nix>;
   };
 
-  nix.binaryCaches = [ "http://localhost:3142/nixos" "https://cache.nixos.org" ];
+  nix = {
+    binaryCaches = [
+      "http://localhost:3142/nixos"
+      "http://cache.prism.r"
+      "https://cache.nixos.org/"
+    ];
+    binaryCachePublicKeys = [
+      "cache.prism-1:+S+6Lo/n27XEtvdlQKuJIcb1yO5NUqUCE2lolmTgNJU="
+      "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs="
+    ];
+  };
 
   networking = {
     firewall.enable = false;
diff --git a/shared/2configs/repo-sync.nix b/shared/2configs/repo-sync.nix
index 4219e5d01..637a26e3c 100644
--- a/shared/2configs/repo-sync.nix
+++ b/shared/2configs/repo-sync.nix
@@ -8,20 +8,23 @@ with lib;
   in {
     enable = true;
     repos.stockholm = {
-      makefu = {
-        origin.url = http://cgit.gum/stockholm ;
-        mirror.url = mirror;
+      branches = {
+        makefu = {
+          origin.url = http://cgit.gum/stockholm ;
+          mirror.url = mirror;
+        };
+        tv = {
+          origin.url = http://cgit.ni.r/stockholm;
+          mirror.url = mirror;
+        };
+        lassulus = {
+          origin.url = http://cgit.prism/stockholm ;
+          mirror.url = mirror;
+        };
       };
-      tv = {
-        origin.url = http://cgit.ni.r/stockholm;
-        mirror.url = mirror;
-      };
-      lassulus = {
-        origin.url = http://cgit.prism/stockholm ;
-        mirror.url = mirror;
-      };
-      "@latest" = {
-        mirror.url = mirror;
+      latest = {
+        url = mirror;
+        ref = "heads/master";
       };
     };
   };