Merge remote-tracking branch 'mors/master' into mors-staging

2 files changed, 81 insertions, 4 deletions

diff --git a/modules/mors/default.nix b/modules/mors/default.nix
index 8768cd1ec..d9ddd285b 100644
--- a/modules/mors/default.nix
+++ b/modules/mors/default.nix
@@ -24,10 +24,12 @@
     ../lass/binary-caches.nix
     ../lass/ircd.nix
     ../../secrets/mors-pw.nix
+    ./repos.nix
   ];
+
   nixpkgs = {
     url = "https://github.com/Lassulus/nixpkgs";
-    rev = "eba85883a07a9fc414d7860f8d6fee4d9f09b2ac";
+    rev = "b74c8eeb73a75eb61148c190df4733474a99a205";
   };
 
   networking.hostName = "mors";
@@ -54,8 +56,6 @@
     initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
     #kernelModules = [ "kvm-intel" "msr" ];
     kernelModules = [ "msr" ];
-    extraModprobeConfig = ''
-    '';
   };
   fileSystems = {
     "/" = {
@@ -145,7 +145,6 @@
   '';
 
   services.xserver = {
-
     videoDriver = "intel";
     vaapiDrivers = [ pkgs.vaapiIntel ];
     deviceSection = ''
diff --git a/modules/mors/repos.nix b/modules/mors/repos.nix
new file mode 100644
index 000000000..e31ba9481
--- /dev/null
+++ b/modules/mors/repos.nix
@@ -0,0 +1,78 @@
+{ ... }:
+
+{
+  imports = [
+    ../lass/gitolite-base.nix
+    ../common/krebs-keys.nix
+    ../common/krebs-repos.nix
+  ];
+
+  services.gitolite = {
+    repos = {
+
+      config = {
+        users = {
+          lass = "RW+";
+          uriel = "R";
+          tv = "R";
+        };
+        extraConfig = "option hook.post-receive = irc-announce";
+      };
+
+      pass = {
+        users = {
+          lass = "RW+";
+          uriel = "R";
+        };
+      };
+
+      load-env = {
+        users = {
+          lass = "RW+";
+          uriel = "R";
+          tv = "R";
+        };
+        extraConfig = "option hook.post-receive = irc-announce";
+      };
+
+      emse-hsdb = {
+        users = {
+          lass = "RW+";
+          uriel = "R";
+          tv = "R";
+        };
+        extraConfig = "option hook.post-receive = irc-announce";
+      };
+
+      brain = {
+        users = {
+          lass = "RW+";
+        };
+        extraConfig = "option hook.post-receive = irc-announce";
+        #hooks.post-receive = irc-announce;
+      };
+
+      painload = {
+        users = {
+          lass = "RW+";
+        };
+        extraConfig = "option hook.post-receive = irc-announce";
+      };
+
+      services = {
+        users = {
+          lass = "RW+";
+        };
+        extraConfig = "option hook.post-receive = irc-announce";
+      };
+
+      xmonad-config = {
+        users = {
+          lass = "RW+";
+          uriel = "R";
+        };
+      };
+
+    };
+  };
+}