summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/wry.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-11-06 22:23:46 +0100
committermakefu <github@syntax-fehler.de>2015-11-06 22:23:46 +0100
commit736e1426d5a7ec76d0987840552d56c6b4f0248e (patch)
tree944c5595dfbb2c66dfe934d48cc8349522c91aa8 /makefu/1systems/wry.nix
parent2dcb2918d1cd159d9282096ef3b5cecc4239bfbc (diff)
parent12597b1febb0bc47cf98529a12e5fc6af1d8f5a4 (diff)
Merge branch 'master' of pnp:stockholm
Diffstat (limited to 'makefu/1systems/wry.nix')
-rw-r--r--makefu/1systems/wry.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index c90b84451..90710c857 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -8,7 +8,8 @@ let
in {
imports = [
# TODO: copy this config or move to krebs
- ../../tv/2configs/CAC-CentOS-7-64bit.nix
+ ../../tv/2configs/hw/CAC.nix
+ ../../tv/2configs/fs/CAC-CentOS-7-64bit.nix
../2configs/base.nix
../2configs/unstable-sources.nix
../2configs/headless.nix
@@ -23,6 +24,8 @@ in {
# other nginx
../2configs/nginx/euer.wiki.nix
+ ../2configs/nginx/euer.blog.nix
+
# collectd
../2configs/collectd/collectd-base.nix
];
@@ -71,5 +74,5 @@ in {
nameservers = [ "8.8.8.8" ];
};
-
+ environment.systemPackages = [ pkgs.translate-shell ];
}