From 9b33995e2943636ac5a8f8d7481e7f88554644cb Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Wed, 8 Apr 2015 01:26:30 +0200
Subject: hosts tv: use tv/base

---
 modules/cd/default.nix | 4 +---
 modules/mu/default.nix | 6 ++----
 modules/tv/base.nix    | 3 +--
 modules/wu/default.nix | 3 +++
 4 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'modules')

diff --git a/modules/cd/default.nix b/modules/cd/default.nix
index a4e6bbc7..f912afa1 100644
--- a/modules/cd/default.nix
+++ b/modules/cd/default.nix
@@ -6,6 +6,7 @@
       <secrets/hashedPasswords.nix>
       ./iptables.nix
       ./networking.nix
+      ../tv/base.nix
       ../tv/base-cac-CentOS-7-64bit.nix
       ../tv/ejabberd.nix # XXX echtes modul
       ../tv/exim-smarthost.nix
@@ -65,9 +66,6 @@
 
   sound.enable = false;
 
-  # TODO base
-  time.timeZone = "UTC";
-
   # TODO replace by ./modules/cd-users.nix
   users.extraGroups = {
 
diff --git a/modules/mu/default.nix b/modules/mu/default.nix
index baec9bf8..4bbd074d 100644
--- a/modules/mu/default.nix
+++ b/modules/mu/default.nix
@@ -11,12 +11,13 @@ in
 {
   imports = [
     <secrets/hashedPasswords.nix>
+    ../tv/base.nix
     ../tv/exim-retiolum.nix
     ../tv/retiolum.nix
     ../tv/sanitize.nix
   ];
 
-  time.timeZone = "Europe/Berlin";
+  nix.maxJobs = 2;
 
   services.udev.extraRules = ''
     SUBSYSTEM=="net", ATTR{address}=="00:90:f5:da:aa:c3", NAME="en0"
@@ -74,9 +75,6 @@ in
 
   swapDevices =[ ];
 
-  nix.maxJobs = 8;
-  nix.useChroot = true;
-
   nixpkgs.config.firefox.enableAdobeFlash = true;
   nixpkgs.config.chromium.enablePepperFlash = true;
 
diff --git a/modules/tv/base.nix b/modules/tv/base.nix
index 76c8b897..94f3609c 100644
--- a/modules/tv/base.nix
+++ b/modules/tv/base.nix
@@ -3,8 +3,6 @@
 {
   time.timeZone = "Europe/Berlin";
 
-  nix.maxJobs = 8;
-  nix.useChroot = true;
   # TODO check if both are required:
   nix.chrootDirs = [ "/etc/protocols" pkgs.iana_etc.outPath ];
 
@@ -14,4 +12,5 @@
     "http://hydra.nixos.org"
   ];
 
+  nix.useChroot = true;
 }
diff --git a/modules/wu/default.nix b/modules/wu/default.nix
index f586552e..260e8285 100644
--- a/modules/wu/default.nix
+++ b/modules/wu/default.nix
@@ -22,6 +22,9 @@ in
     ../tv/xserver.nix
   ];
 
+  nix.maxJobs = 8;
+
+
   services.udev.extraRules = ''
     SUBSYSTEM=="net", ATTR{address}=="00:90:f5:da:aa:c3", NAME="en0"
     SUBSYSTEM=="net", ATTR{address}=="a0:88:b4:1b:ae:6c", NAME="wl0"
-- 
cgit v1.2.3