diff --git a/1systems/gum.nix b/1systems/gum.nix index c4dfbf4..fe800f2 100644 --- a/1systems/gum.nix +++ b/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/1systems/repunit.nix b/1systems/repunit.nix index a069cc3..0c6ba09 100644 --- a/1systems/repunit.nix +++ b/1systems/repunit.nix @@ -32,7 +32,6 @@ }; krebs.retiolum = { enable = true; - hosts = ../../krebs/Zhosts; connectTo = [ "gum" "pigstarter" diff --git a/1systems/vbob.nix b/1systems/vbob.nix index b1e5ef8..2dee837 100644 --- a/1systems/vbob.nix +++ b/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. @@ -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/2configs/backup.nix b/2configs/backup.nix index ed6d1f4..936f31c 100644 --- a/2configs/backup.nix +++ b/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/5pkgs/default.nix b/5pkgs/default.nix index 436c52f..c4a7f49 100644 --- a/5pkgs/default.nix +++ b/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 {}; + }; }