From b7a92f63884af00eb0243ec9328be689a6c9b845 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 15 Feb 2016 16:29:01 +0100
Subject: [PATCH] *: make eval.config.krebs.build.host.name work everywhere

---
 krebs/3modules/backup.nix    | 2 +-
 krebs/3modules/default.nix   | 4 ++--
 lass/3modules/urxvtd.nix     | 3 ++-
 lass/3modules/xresources.nix | 3 ++-
 makefu/1systems/repunit.nix  | 2 +-
 makefu/2configs/default.nix  | 1 -
 makefu/3modules/snapraid.nix | 2 +-
 makefu/3modules/umts.nix     | 2 +-
 8 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/krebs/3modules/backup.nix b/krebs/3modules/backup.nix
index 5e1a1597b..0aa86dec9 100644
--- a/krebs/3modules/backup.nix
+++ b/krebs/3modules/backup.nix
@@ -210,7 +210,7 @@ let
       | ${pkgs.coreutils}/bin/head -1; }
   '';
 
-  # Note that we don't escape word on purpose, so we deref shell vars.
+  # Note that we don't escape word on purpose, so we can deref shell vars.
   # TODO type word
   network-ssh-port = host: word: ''
     case ${word} in
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 23f82ed1c..16a74e7c1 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -9,9 +9,9 @@ let
       ./apt-cacher-ng.nix
       ./backup.nix
       ./bepasty-server.nix
-      ./build.nix
       ./buildbot/master.nix
       ./buildbot/slave.nix
+      ./build.nix
       ./current.nix
       ./exim-retiolum.nix
       ./exim-smarthost.nix
@@ -25,8 +25,8 @@ let
       ./nixpkgs.nix
       ./per-user.nix
       ./Reaktor.nix
-      ./retiolum-bootstrap.nix
       ./realwallpaper.nix
+      ./retiolum-bootstrap.nix
       ./retiolum.nix
       ./setuid.nix
       ./tinc_graphs.nix
diff --git a/lass/3modules/urxvtd.nix b/lass/3modules/urxvtd.nix
index 1eb463955..469616a9f 100644
--- a/lass/3modules/urxvtd.nix
+++ b/lass/3modules/urxvtd.nix
@@ -3,7 +3,8 @@
 let
 in
 
-with config.krebs.lib;
+with builtins;
+with lib;
 
 {
   options = {
diff --git a/lass/3modules/xresources.nix b/lass/3modules/xresources.nix
index 729eccecc..074963022 100644
--- a/lass/3modules/xresources.nix
+++ b/lass/3modules/xresources.nix
@@ -6,7 +6,8 @@
 
 #
 #
-with config.krebs.lib;
+with builtins;
+with lib;
 
 
 let
diff --git a/makefu/1systems/repunit.nix b/makefu/1systems/repunit.nix
index 6d2e7273d..f9421cfa2 100644
--- a/makefu/1systems/repunit.nix
+++ b/makefu/1systems/repunit.nix
@@ -9,7 +9,7 @@
     [ # Include the results of the hardware scan.
       ../.
       <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
-      ../2configs/cgit-retiolum.nix
+      ../2configs/git/cgit-retiolum.nix
     ];
   krebs.build.host = config.krebs.hosts.repunit;
 
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 153e80bb1..83018e9f8 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -18,7 +18,6 @@ with config.krebs.lib;
     enable = true;
     search-domain = "retiolum";
     build =  {
-      target = mkDefault "root@${config.krebs.build.host.name}";
       user = config.krebs.users.makefu;
       source =  mapAttrs (_: mkDefault) {
         nixpkgs = {
diff --git a/makefu/3modules/snapraid.nix b/makefu/3modules/snapraid.nix
index 4a0363e6a..3d458bbbf 100644
--- a/makefu/3modules/snapraid.nix
+++ b/makefu/3modules/snapraid.nix
@@ -28,7 +28,7 @@ let
 
   out = {
     options.makefu.snapraid = api;
-    config = mkIf cfg.enable imp;
+    config = lib.mkIf cfg.enable imp;
   };
 
   api = {
diff --git a/makefu/3modules/umts.nix b/makefu/3modules/umts.nix
index 7e0e5dada..e527a5cb7 100644
--- a/makefu/3modules/umts.nix
+++ b/makefu/3modules/umts.nix
@@ -32,7 +32,7 @@ let
 
   out = {
     options.makefu.umts = api;
-    config = mkIf cfg.enable imp;
+    config = lib.mkIf cfg.enable imp;
   };
 
   api = {