diff options
| author | makefu <github@syntax-fehler.de> | 2015-11-06 22:23:46 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-11-06 22:23:46 +0100 |
| commit | e53b817438488046d9f9301f1a3838b4c69cfbe4 (patch) | |
| tree | 50c8c96640d2bc1a3faa7a067af6feb6381502ab /1systems | |
| parent | d9ac84ce586ed772a7dbb536bd14418370373389 (diff) | |
| parent | d6a5eb307c5cf3d86701b12c0865382fa13162f5 (diff) | |
Merge branch 'master' of pnp:stockholm
Diffstat (limited to '1systems')
| -rw-r--r-- | 1systems/wry.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/1systems/wry.nix b/1systems/wry.nix index c90b84451..90710c857 100644 --- a/1systems/wry.nix +++ b/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 ]; } |