diff options
author | nin <nineinchnade@gmail.com> | 2017-09-29 19:11:43 +0200 |
---|---|---|
committer | nin <nineinchnade@gmail.com> | 2017-09-29 19:11:43 +0200 |
commit | f4bf9110727f2c7113c80aaa88427b81605016ae (patch) | |
tree | a56a491867eeb0deaca97c7ff272d563a026ec5c /tv/1systems | |
parent | 7a7d085d33e1aa8e97f9f91d0fe53a1e378ce75e (diff) | |
parent | 6dfe071664136790b7d62bf062e090722997372f (diff) |
Merge branch 'master' of prism:stockholm
Diffstat (limited to 'tv/1systems')
-rw-r--r-- | tv/1systems/cd/config.nix | 35 | ||||
-rw-r--r-- | tv/1systems/cd/source.nix | 3 | ||||
-rw-r--r-- | tv/1systems/wu/config.nix | 1 | ||||
-rw-r--r-- | tv/1systems/xu/config.nix | 6 |
4 files changed, 6 insertions, 39 deletions
diff --git a/tv/1systems/cd/config.nix b/tv/1systems/cd/config.nix deleted file mode 100644 index 341a62e4..00000000 --- a/tv/1systems/cd/config.nix +++ /dev/null @@ -1,35 +0,0 @@ -with import <stockholm/lib>; -{ config, pkgs, ... }: let - - bestGuessGateway = addr: elemAt (match "(.*)(\.[^.])" addr) 0 + ".1"; - -in { - krebs.build.host = config.krebs.hosts.cd; - - imports = [ - <stockholm/tv> - <stockholm/tv/2configs/hw/CAC-Developer-2.nix> - <stockholm/tv/2configs/fs/CAC-CentOS-7-64bit.nix> - <stockholm/tv/2configs/exim-smarthost.nix> - <stockholm/tv/2configs/retiolum.nix> - ]; - - networking = let - address = config.krebs.build.host.nets.internet.ip4.addr; - in { - defaultGateway = bestGuessGateway address; - interfaces.enp2s1.ip4 = singleton { - inherit address; - prefixLength = 24; - }; - nameservers = ["8.8.8.8"]; - }; - - environment.systemPackages = with pkgs; [ - iftop - iotop - iptables - nethogs - tcpdump - ]; -} diff --git a/tv/1systems/cd/source.nix b/tv/1systems/cd/source.nix deleted file mode 100644 index 019e8bc2..00000000 --- a/tv/1systems/cd/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import <stockholm/tv/source.nix> { - name = "cd"; -} diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix index 79b5aa26..5c593894 100644 --- a/tv/1systems/wu/config.nix +++ b/tv/1systems/wu/config.nix @@ -8,7 +8,6 @@ with import <stockholm/lib>; <stockholm/tv/2configs/hw/w110er.nix> <stockholm/tv/2configs/exim-retiolum.nix> <stockholm/tv/2configs/gitrepos.nix> - <stockholm/tv/2configs/im.nix> <stockholm/tv/2configs/mail-client.nix> <stockholm/tv/2configs/man.nix> <stockholm/tv/2configs/nginx/public_html.nix> diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix index 0abd544c..0363c983 100644 --- a/tv/1systems/xu/config.nix +++ b/tv/1systems/xu/config.nix @@ -16,6 +16,7 @@ with import <stockholm/lib>; <stockholm/tv/2configs/pulse.nix> <stockholm/tv/2configs/retiolum.nix> <stockholm/tv/2configs/binary-cache> + <stockholm/tv/2configs/br.nix> <stockholm/tv/2configs/xserver> { environment.systemPackages = with pkgs; [ @@ -155,5 +156,10 @@ with import <stockholm/lib>; # The NixOS release to be compatible with for stateful data such as databases. system.stateVersion = "15.09"; + tv.nixpkgs-overlays = { + krebs = "/home/tv/stockholm/krebs/5pkgs"; + tv = "/home/tv/stockholm/tv/5pkgs"; + }; + virtualisation.virtualbox.host.enable = true; } |