Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hosts tv: use tv/base

Browse Source
This commit is contained in:
tv 2015-04-08 01:26:30 +02:00
parent cd6374e641
commit 9b33995e29
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/cd/default.nix
View File

@ -6,6 +6,7 @@
<secrets/hashedPasswords.nix> <secrets/hashedPasswords.nix>
./iptables.nix ./iptables.nix
./networking.nix ./networking.nix
../tv/base.nix
../tv/base-cac-CentOS-7-64bit.nix ../tv/base-cac-CentOS-7-64bit.nix
../tv/ejabberd.nix # XXX echtes modul ../tv/ejabberd.nix # XXX echtes modul
../tv/exim-smarthost.nix ../tv/exim-smarthost.nix
@ -65,9 +66,6 @@
sound.enable = false; sound.enable = false;
# TODO base
time.timeZone = "UTC";
# TODO replace by ./modules/cd-users.nix # TODO replace by ./modules/cd-users.nix
users.extraGroups = { users.extraGroups = {

6
modules/mu/default.nix
View File

@ -11,12 +11,13 @@ in
{ {
imports = [ imports = [
<secrets/hashedPasswords.nix> <secrets/hashedPasswords.nix>
../tv/base.nix
../tv/exim-retiolum.nix ../tv/exim-retiolum.nix
../tv/retiolum.nix ../tv/retiolum.nix
../tv/sanitize.nix ../tv/sanitize.nix
]; ];
time.timeZone = "Europe/Berlin"; nix.maxJobs = 2;
services.udev.extraRules = '' services.udev.extraRules = ''
SUBSYSTEM=="net", ATTR{address}=="00:90:f5:da:aa:c3", NAME="en0" SUBSYSTEM=="net", ATTR{address}=="00:90:f5:da:aa:c3", NAME="en0"
@ -74,9 +75,6 @@ in
swapDevices =[ ]; swapDevices =[ ];
nix.maxJobs = 8;
nix.useChroot = true;
nixpkgs.config.firefox.enableAdobeFlash = true; nixpkgs.config.firefox.enableAdobeFlash = true;
nixpkgs.config.chromium.enablePepperFlash = true; nixpkgs.config.chromium.enablePepperFlash = true;

3
modules/tv/base.nix
View File

@ -3,8 +3,6 @@
{ {
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
nix.maxJobs = 8;
nix.useChroot = true;
# TODO check if both are required: # TODO check if both are required:
nix.chrootDirs = [ "/etc/protocols" pkgs.iana_etc.outPath ]; nix.chrootDirs = [ "/etc/protocols" pkgs.iana_etc.outPath ];
@ -14,4 +12,5 @@
"http://hydra.nixos.org" "http://hydra.nixos.org"
]; ];
nix.useChroot = true;
} }

3
modules/wu/default.nix
View File

@ -22,6 +22,9 @@ in
../tv/xserver.nix ../tv/xserver.nix
]; ];
nix.maxJobs = 8;
services.udev.extraRules = '' services.udev.extraRules = ''
SUBSYSTEM=="net", ATTR{address}=="00:90:f5:da:aa:c3", NAME="en0" SUBSYSTEM=="net", ATTR{address}=="00:90:f5:da:aa:c3", NAME="en0"
SUBSYSTEM=="net", ATTR{address}=="a0:88:b4:1b:ae:6c", NAME="wl0" SUBSYSTEM=="net", ATTR{address}=="a0:88:b4:1b:ae:6c", NAME="wl0"