Merge remote-tracking branch 'lass/master'

2 files changed, 11 insertions, 3 deletions

diff --git a/lass/1systems/green/config.nix b/lass/1systems/green/config.nix
index d7bf62b40..b41e396c9 100644
--- a/lass/1systems/green/config.nix
+++ b/lass/1systems/green/config.nix
@@ -17,6 +17,8 @@ with import <stockholm/lib>;
     <stockholm/lass/2configs/IM.nix>
     <stockholm/lass/2configs/muchsync.nix>
     <stockholm/lass/2configs/pass.nix>
+
+    <stockholm/lass/2configs/git-brain.nix>
   ];
 
   krebs.build.host = config.krebs.hosts.green;
@@ -68,6 +70,13 @@ with import <stockholm/lib>;
       ];
       clearTarget = true;
     };
+    "/var/lib/git" = {
+      source = "/var/state/git";
+      options = [
+        "-M ${toString config.users.users.git.uid}"
+      ];
+      clearTarget = true;
+    };
   };
 
   systemd.services."bindfs-_home_lass_Maildir".serviceConfig.ExecStartPost = pkgs.writeDash "symlink-notmuch" ''
diff --git a/lass/1systems/green/source.nix b/lass/1systems/green/source.nix
index 48499c9db..da137e064 100644
--- a/lass/1systems/green/source.nix
+++ b/lass/1systems/green/source.nix
@@ -1,5 +1,4 @@
-{ lib, pkgs, ... }:
-{
+{ lib, pkgs, test, ... }:
+if test then {} else {
   nixpkgs-unstable = lib.mkForce { file = "/var/empty"; };
-  nixpkgs.git.shallow = true;
 }