makefu/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cd/master'

Browse source
This commit is contained in:
makefu 2016-02-11 21:31:15 +01:00
parent 6eb44e38dd 1ae6f1eeab
commit 234a7e8236
5 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
1systems/gum.nix
View file

@ -26,7 +26,6 @@ in {
nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
###### stable ###### stable
krebs.build.target = "root@gum.krebsco.de";
krebs.build.host = config.krebs.hosts.gum; krebs.build.host = config.krebs.hosts.gum;
krebs.retiolum.extraConfig = '' krebs.retiolum.extraConfig = ''
ListenAddress = ${external-ip} 53 ListenAddress = ${external-ip} 53

1
1systems/repunit.nix
View file

@ -32,7 +32,6 @@
}; };
krebs.retiolum = { krebs.retiolum = {
enable = true; enable = true;
hosts = ../../krebs/Zhosts;
connectTo = [ connectTo = [
"gum" "gum"
"pigstarter" "pigstarter"

2
1systems/vbob.nix
View file

@ -4,7 +4,6 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
krebs.build.host = config.krebs.hosts.vbob; krebs.build.host = config.krebs.hosts.vbob;
krebs.build.target = "root@10.10.10.220";
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
<nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix> <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>
@ -51,7 +50,6 @@
krebs.retiolum = { krebs.retiolum = {
enable = true; enable = true;
extraConfig = "Proxy = http global.proxy.alcatel-lucent.com 8000"; extraConfig = "Proxy = http global.proxy.alcatel-lucent.com 8000";
hosts = ../../krebs/Zhosts;
connectTo = [ connectTo = [
"gum" "gum"
]; ];

2
2configs/backup.nix
View file

@ -24,7 +24,7 @@ let
}; };
}; };
in { in {
krebs.backup.plans = addNames { krebs.backup.plans = {
wry-to-omo_var-www = defaultPull wry "/var/www"; wry-to-omo_var-www = defaultPull wry "/var/www";
}; };
} }

12
5pkgs/default.nix
View file

@ -4,9 +4,11 @@ let
inherit (pkgs) callPackage; inherit (pkgs) callPackage;
in in
{ {
alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";}; nixpkgs.config.packageOverrides = rec {
alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";}; alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";};
alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";}; alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
awesomecfg = callPackage ./awesomecfg {}; alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
tw-upload-plugin = callPackage ./tw-upload-plugin {}; awesomecfg = callPackage ./awesomecfg {};
tw-upload-plugin = callPackage ./tw-upload-plugin {};
};
} }