5 files changed, 35 insertions, 28 deletions
diff --git a/krebs/3modules/git.nix b/krebs/3modules/git.nix
index 347a2c32b..961b217e1 100644
--- a/krebs/3modules/git.nix
+++ b/krebs/3modules/git.nix
@@ -468,6 +468,16 @@ let
         include ${pkgs.nginx}/conf/fastcgi_params;
         fastcgi_param GIT_HTTP_EXPORT_ALL "";
         fastcgi_param GIT_PROJECT_ROOT ${cfg.dataDir};
+        fastcgi_param HOME ${pkgs.write "git-http-backend.home" {
+          "/.gitconfig".text = /* ini */ ''
+            [safe]
+            directory = .
+            ${concatMapStrings
+              (repo: "directory = ${cfg.dataDir}/${repo.name}\n")
+              (attrValues cfg.repos)
+            }
+          '';
+        }};
         fastcgi_param PATH_INFO $fastcgi_script_name;
         fastcgi_param SCRIPT_FILENAME ${pkgs.git}/bin/git-http-backend;
         fastcgi_pass unix:${config.services.fcgiwrap.socketAddress};
diff --git a/krebs/3modules/os-release.nix b/krebs/3modules/os-release.nix
index bfd352825..929ec45d9 100644
--- a/krebs/3modules/os-release.nix
+++ b/krebs/3modules/os-release.nix
@@ -8,28 +8,34 @@ let
   nixos-version = "${nixos-version-id} (${nixos-codeName})";
   nixos-pretty-name = "NixOS ${nixos-version}";
 
-  stockholm-version-id = let
-    eval = builtins.tryEval (removeSuffix "\n" (readFile <stockholm-version>));
-  in
-    if eval.success then eval.value else "unknown";
-
-  stockholm-version = "${stockholm-version-id}";
+  stockholm-version = "${config.krebs.os-release.stockholm-version-id}";
   stockholm-pretty-name = "stockholm ${stockholm-version}";
 
   version = "${stockholm-version}/${nixos-version}";
-  version-id = "${stockholm-version-id}/${nixos-version-id}";
+  version-id = "${config.krebs.os-release.stockholm-version-id}/${nixos-version-id}";
   pretty-name = "${stockholm-pretty-name} / ${nixos-pretty-name}";
 
   home-url = http://cgit.ni.krebsco.de/stockholm;
 in
 {
-  # http://0pointer.de/public/systemd-man/os-release.html
-  environment.etc."os-release".text = mkForce ''
-    NAME="stockholm/NixOS"
-    ID=stockholm
-    VERSION="${version}"
-    VERSION_ID="${version-id}"
-    PRETTY_NAME="${pretty-name}"
-    HOME_URL="${home-url}"
-  '';
+  options.krebs.os-release = {
+    stockholm-version-id = lib.mkOption {
+      type = lib.types.str;
+      default = let
+          eval = builtins.tryEval (removeSuffix "\n" (readFile <stockholm-version>));
+        in
+          if eval.success then eval.value else "unknown";
+    };
+  };
+  config = {
+    # http://0pointer.de/public/systemd-man/os-release.html
+    environment.etc."os-release".text = mkForce ''
+      NAME="stockholm/NixOS"
+      ID=stockholm
+      VERSION="${version}"
+      VERSION_ID="${version-id}"
+      PRETTY_NAME="${pretty-name}"
+      HOME_URL="${home-url}"
+    '';
+  };
 }
diff --git a/krebs/3modules/upstream/desktop-managers/default.nix b/krebs/3modules/upstream/desktop-managers/default.nix
index 22e75439d..5fd39086c 100644
--- a/krebs/3modules/upstream/desktop-managers/default.nix
+++ b/krebs/3modules/upstream/desktop-managers/default.nix
@@ -1,6 +1,5 @@
 {
   imports = [
     ./coma.nix
-    ./none.nix
   ];
 }
diff --git a/krebs/3modules/upstream/desktop-managers/none.nix b/krebs/3modules/upstream/desktop-managers/none.nix
deleted file mode 100644
index 77f7ad513..000000000
--- a/krebs/3modules/upstream/desktop-managers/none.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib, ... }:
-# Replace upstream none desktop-manager by a real none, that doesn't pull in
-# any dependencies.
-{
-  disabledModules = lib.singleton "services/x11/desktop-managers/none.nix";
-  config.services.xserver.desktopManager.session = lib.singleton {
-    name = "none";
-    bgSupport = true;
-    start = "";
-  };
-}
diff --git a/krebs/3modules/zones.nix b/krebs/3modules/zones.nix
index 7a9cf5be1..51e559d88 100644
--- a/krebs/3modules/zones.nix
+++ b/krebs/3modules/zones.nix
@@ -21,6 +21,9 @@ with lib; {
 
         panda NS panda
         panda A 130.61.237.100
+
+        xkey A 217.197.83.17
+        xkey AAAA 2a0a:4580:5011::1
       '';
     };
   };