5 files changed, 8 insertions, 10 deletions
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix
index c4dfbf4b7..fe800f251 100644
--- a/makefu/1systems/gum.nix
+++ b/makefu/1systems/gum.nix
@@ -26,7 +26,6 @@ in {
   nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
 
   ###### stable
-  krebs.build.target = "root@gum.krebsco.de";
   krebs.build.host = config.krebs.hosts.gum;
   krebs.retiolum.extraConfig = ''
     ListenAddress = ${external-ip} 53
diff --git a/makefu/1systems/repunit.nix b/makefu/1systems/repunit.nix
index a069cc36f..0c6ba09fb 100644
--- a/makefu/1systems/repunit.nix
+++ b/makefu/1systems/repunit.nix
@@ -32,7 +32,6 @@
   };
   krebs.retiolum = {
     enable = true;
-    hosts = ../../krebs/Zhosts;
     connectTo = [
       "gum"
       "pigstarter"
diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix
index b1e5ef8b5..2dee83728 100644
--- a/makefu/1systems/vbob.nix
+++ b/makefu/1systems/vbob.nix
@@ -4,7 +4,6 @@
 { lib, config, pkgs, ... }:
 {
   krebs.build.host = config.krebs.hosts.vbob;
-  krebs.build.target = "root@10.10.10.220";
   imports =
     [ # Include the results of the hardware scan.
       <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>
@@ -51,7 +50,6 @@
   krebs.retiolum = {
     enable = true;
     extraConfig = "Proxy = http global.proxy.alcatel-lucent.com 8000";
-    hosts = ../../krebs/Zhosts;
     connectTo = [
       "gum"
     ];
diff --git a/makefu/2configs/backup.nix b/makefu/2configs/backup.nix
index ed6d1f4a7..936f31c1c 100644
--- a/makefu/2configs/backup.nix
+++ b/makefu/2configs/backup.nix
@@ -24,7 +24,7 @@ let
     };
   };
 in {
-  krebs.backup.plans = addNames {
+  krebs.backup.plans = {
     wry-to-omo_var-www = defaultPull wry "/var/www";
   };
 }
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 436c52fcd..c4a7f498f 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -4,9 +4,11 @@ let
   inherit (pkgs) callPackage;
 in
 {
-  alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";};
-  alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
-  alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
-  awesomecfg = callPackage ./awesomecfg {};
-  tw-upload-plugin = callPackage ./tw-upload-plugin {};
+  nixpkgs.config.packageOverrides = rec {
+    alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";};
+    alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
+    alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
+    awesomecfg = callPackage ./awesomecfg {};
+    tw-upload-plugin = callPackage ./tw-upload-plugin {};
+  };
 }