From e5e56abd6d3aeb547b773015f79cfcf0251eae9a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 9 Nov 2015 18:01:30 +0100
Subject: tv git: add repo xmonad-stockholm

---
 tv/2configs/git.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tv/2configs/git.nix')

diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix
index 2520da173..38af92b02 100644
--- a/tv/2configs/git.nix
+++ b/tv/2configs/git.nix
@@ -47,6 +47,7 @@ let
     wai-middleware-time = {};
     web-routes-wai-custom = {};
     xintmap = {};
+    xmonad-stockholm = {};
   });
 
   restricted-repos = mapAttrs make-restricted-repo (
-- 
cgit v1.2.3


From 2263c04e7c95caa5c21fb80952a19916eace5a3e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 9 Nov 2015 18:01:52 +0100
Subject: tv git: tv_xu has R/W-access to protected repos

---
 tv/2configs/git.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/2configs/git.nix')

diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix
index 38af92b02..ff5bedce9 100644
--- a/tv/2configs/git.nix
+++ b/tv/2configs/git.nix
@@ -83,7 +83,7 @@ let
     with git // config.krebs.users;
     repo:
       singleton {
-        user = tv;
+        user = [ tv tv_xu ];
         repo = [ repo ];
         perm = push "refs/*" [ non-fast-forward create delete merge ];
       } ++
-- 
cgit v1.2.3


From 1f4d7ffa50483cde6024fe910fb16d0c8040e245 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 9 Nov 2015 18:34:02 +0100
Subject: tv git: move old stuff to the museum section

---
 tv/2configs/git.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'tv/2configs/git.nix')

diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix
index ff5bedce9..3c0524b33 100644
--- a/tv/2configs/git.nix
+++ b/tv/2configs/git.nix
@@ -20,26 +20,22 @@ let
   rules = concatMap make-rules (attrValues repos);
 
   public-repos = mapAttrs make-public-repo ({
+  } // mapAttrValues (setAttr "section" "1. Miscellaneous") {
     cac = {
       desc = "CloudAtCost command line interface";
     };
-    cgserver = {};
-    crude-mail-setup = {};
-    dot-xmonad = {};
     get = {};
     hack = {};
     load-env = {};
     make-snapshot = {};
     much = {};
-    nixos-infest = {};
     nixpkgs = {};
-    painload = {};
     push = {};
     regfish = {};
     stockholm = {
       desc = "take all the computers hostage, they'll love you!";
     };
-  } // mapAttrs (_: repo: repo // { section = "Haskell libraries"; }) {
+  } // mapAttrValues (setAttr "section" "2. Haskell libraries") {
     blessings = {};
     mime = {};
     quipper = {};
@@ -48,6 +44,12 @@ let
     web-routes-wai-custom = {};
     xintmap = {};
     xmonad-stockholm = {};
+  } // mapAttrValues (setAttr "section" "3. Museum") {
+    cgserver = {};
+    crude-mail-setup = {};
+    dot-xmonad = {};
+    nixos-infest = {};
+    painload = {};
   });
 
   restricted-repos = mapAttrs make-restricted-repo (
-- 
cgit v1.2.3


From 85c25d6947f370c8ab8a304d7371ea9085003d3d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 9 Nov 2015 18:51:26 +0100
Subject: tv {lib.git => pkgs.git-hooks} irc-announce

---
 tv/2configs/git.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/2configs/git.nix')

diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix
index 3c0524b33..63d65a630 100644
--- a/tv/2configs/git.nix
+++ b/tv/2configs/git.nix
@@ -66,7 +66,7 @@ let
     inherit name desc section;
     public = true;
     hooks = {
-      post-receive = git.irc-announce {
+      post-receive = pkgs.git-hooks.irc-announce {
         # TODO make nick = config.krebs.build.host.name the default
         nick = config.krebs.build.host.name;
         channel = "#retiolum";
-- 
cgit v1.2.3


From 1f39b86dad2f8ddeb8008f6dda02a6dea1c369a6 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 9 Nov 2015 18:52:11 +0100
Subject: stockholm: import user lib if it exists

---
 tv/2configs/git.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tv/2configs/git.nix')

diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix
index 63d65a630..4387be36a 100644
--- a/tv/2configs/git.nix
+++ b/tv/2configs/git.nix
@@ -1,6 +1,7 @@
 { config, lib, pkgs, ... }:
 
-with import ../4lib { inherit lib pkgs; };
+with lib;
+
 let
 
   out = {
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/5f000000.lock: No such file or directory (2)