From c6654de563efb4e4afcb53a6760ab6767693389f Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Wed, 8 Mar 2017 00:52:31 +0100
Subject: s 2 repo-sync: use new api

---
 shared/2configs/repo-sync.nix | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'shared')

diff --git a/shared/2configs/repo-sync.nix b/shared/2configs/repo-sync.nix
index 4219e5d01..004ea5942 100644
--- a/shared/2configs/repo-sync.nix
+++ b/shared/2configs/repo-sync.nix
@@ -8,19 +8,21 @@ with lib;
   in {
     enable = true;
     repos.stockholm = {
-      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;
+      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;
+        };
       };
-      "@latest" = {
+      latest = {
         mirror.url = mirror;
       };
     };
-- 
cgit v1.2.3


From 42639587fd0f28b8568f2aee8cf3463b0cc0e239 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Wed, 8 Mar 2017 14:22:04 +0100
Subject: s 2 repo-sync: fix latest

---
 shared/2configs/repo-sync.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'shared')

diff --git a/shared/2configs/repo-sync.nix b/shared/2configs/repo-sync.nix
index 004ea5942..637a26e3c 100644
--- a/shared/2configs/repo-sync.nix
+++ b/shared/2configs/repo-sync.nix
@@ -23,7 +23,8 @@ with lib;
         };
       };
       latest = {
-        mirror.url = mirror;
+        url = mirror;
+        ref = "heads/master";
       };
     };
   };
-- 
cgit v1.2.3


From cf9c5ee222931f65bf9b37a3f66e849dee3a57ac Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Wed, 8 Mar 2017 17:12:26 +0100
Subject: s 1 wolf: add prism as binary cache

---
 shared/1systems/wolf.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'shared')

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;
-- 
cgit v1.2.3