Merge remote-tracking branch 'mors/master' into morse-merge

4 files changed, 78 insertions, 5 deletions

diff --git a/modules/lass/xresources.nix b/modules/lass/xresources.nix
index 1b85830c..00a9e5c9 100644
--- a/modules/lass/xresources.nix
+++ b/modules/lass/xresources.nix
@@ -12,7 +12,7 @@ with lib;
 
 let
 
-  inherit (import ../../lib { inherit pkgs; }) shell-escape;
+  inherit (import ../../lib { inherit pkgs; inherit lib; }) shell-escape;
   inherit (pkgs) writeScript;
 
 in
@@ -43,7 +43,7 @@ in
     };
   };
 
-  config = 
+  config =
     let
       cfg = config.services.xresources;
       xres = concatStringsSep "\n" (attrValues cfg.resources);
@@ -53,6 +53,5 @@ in
           echo ${shell-escape xres} | xrdb -merge
         '';
       };
-      
 
 }
diff --git a/modules/mors/default.nix b/modules/mors/default.nix
index d9ddd285..d83d6abc 100644
--- a/modules/mors/default.nix
+++ b/modules/mors/default.nix
@@ -25,11 +25,13 @@
     ../lass/ircd.nix
     ../../secrets/mors-pw.nix
     ./repos.nix
+    ../lass/chromium-patched.nix
+    ./git.nix
   ];
 
   nixpkgs = {
     url = "https://github.com/Lassulus/nixpkgs";
-    rev = "b74c8eeb73a75eb61148c190df4733474a99a205";
+    rev = "45c99e522dcc4ef24cf71dbe38d94a308cb30530";
   };
 
   networking.hostName = "mors";
diff --git a/modules/mors/git.nix b/modules/mors/git.nix
new file mode 100644
index 00000000..1dd61d16
--- /dev/null
+++ b/modules/mors/git.nix
@@ -0,0 +1,71 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ../tv/git
+  ];
+
+  services.git =
+    let
+      inherit (builtins) readFile;
+      # TODO lib should already include our stuff
+      inherit (import ../../lib { inherit lib pkgs; }) addNames git;
+
+      krebs-private = name: desc:
+          {
+            inherit desc;
+            hooks = {
+              post-receive = git.irc-announce {
+                nick = config.networking.hostName; # TODO make this the default
+                channel = "#retiolum";
+                server = "ire.retiolum";
+              };
+            };
+          }
+    in rec {
+      enable = true;
+
+      users = addNames {
+        tv = { pubkey = readFile <pubkeys/tv.ssh.pub>; };
+        lass = { pubkey = readFile <pubkeys/lass.ssh.pub>; };
+        uriel = { pubkey = readFile <pubkeys/lass.ssh.pub>; };
+        makefu = { pubkey = "xxx"; };
+      };
+
+      repos = addNames {
+        shitment = {
+          desc = "shitment repository";
+          hooks = {
+            post-receive = git.irc-announce {
+              nick = config.networking.hostName; # TODO make this the default
+              channel = "#retiolum";
+              server = "ire.retiolum";
+            };
+          };
+          public = true;
+        };
+        testing = {
+          desc = "testing repository";
+          hooks = {
+            post-receive = git.irc-announce {
+              nick = config.networking.hostName; # TODO make this the default
+              channel = "#repository";
+              server = "ire.retiolum";
+            };
+          };
+          public = true;
+        };
+      };
+
+      rules = with git; with users; with repos; [
+        { user = lass;
+          repo = [ testing shitment ];
+          perm = push master [ non-fast-forward create delete merge ];
+        }
+        { user = [ tv uriel makefu ];
+          repo = [ testing shitment ];
+          perm = fetch;
+        }
+      ];
+    };
+}
diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix
index a54dfa7e..7f2b9032 100644
--- a/modules/uriel/default.nix
+++ b/modules/uriel/default.nix
@@ -17,11 +17,12 @@
     ../lass/sshkeys.nix
     ../lass/bird.nix
     ./repos.nix
+    ../lass/chromium-patched.nix
   ];
 
   nixpkgs = {
     url = "https://github.com/Lassulus/nixpkgs";
-    rev = "b74c8eeb73a75eb61148c190df4733474a99a205";
+    rev = "45c99e522dcc4ef24cf71dbe38d94a308cb30530";
   };
 
   networking.hostName = "uriel";