131 files changed, 564 insertions, 1324 deletions

diff --git a/ci.nix b/ci.nix
index 212114538..1aecc8e70 100644
--- a/ci.nix
+++ b/ci.nix
@@ -1,6 +1,6 @@
 # usage: nix-instantiate --eval --json --read-write-mode --strict ci.nix | jq .
-with import ./lib;
 let
+  lib = pkgs.lib;
   pkgs = import <nixpkgs> { overlays = [ (import ./submodules/nix-writers/pkgs) ]; };
   system =
     import <nixpkgs/nixos/lib/eval-config.nix> {
@@ -16,9 +16,9 @@ let
     }
   ;
 
-  ci-systems = filterAttrs (_: v: v.ci) system.config.krebs.hosts;
+  ci-systems = lib.filterAttrs (_: v: v.ci) system.config.krebs.hosts;
 
   build = host: owner:
-  ((import (toString ./. + "/${owner}/krops.nix") { name = host; }).test {target = "${getEnv "HOME"}/stockholm-build";});
+  ((import (toString ./. + "/${owner}/krops.nix") { name = host; }).test {target = "${builtins.getEnv "HOME"}/stockholm-build";});
 
-in mapAttrs (n: h: build n h.owner.name) ci-systems
+in lib.mapAttrs (n: h: build n h.owner.name) ci-systems
diff --git a/default.nix b/default.nix
index 9368dcd9e..45b4f03f6 100644
--- a/default.nix
+++ b/default.nix
@@ -1,7 +1,7 @@
 import <nixpkgs/nixos> {} // rec {
   lib = import ./lib;
   systems = with lib; let
-    namespace = getEnv "LOGNAME";
+    namespace = krebs;