diff options
| author | makefu <github@syntax-fehler.de> | 2015-11-05 12:28:25 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-11-05 12:28:39 +0100 |
| commit | 699822f572162e4ddcc0fa7f5690142cba1c8c5d (patch) | |
| tree | eb214f459d7ceb97ff8cdd5ca2dd69dc5c385a41 | |
| parent | 4050b21d16f9b7d0de9515526cac9a7b65993fef (diff) | |
m 1 wry: use new import layout for CAC from tv
| -rw-r--r-- | makefu/1systems/wry.nix | 7 | ||||
| -rw-r--r-- | makefu/2configs/headless.nix | 4 |
2 files changed, 7 insertions, 4 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 ]; } diff --git a/makefu/2configs/headless.nix b/makefu/2configs/headless.nix index 33847c5e1..772ca3771 100644 --- a/makefu/2configs/headless.nix +++ b/makefu/2configs/headless.nix @@ -1,4 +1,4 @@ -_: +{lib,... }: { - sound.enable = false; + sound.enable = lib.mkForce false; } |