makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

tv config: split stuff into fs and hw

Browse source
This commit is contained in:
tv 2015-10-29 01:09:54 +01:00
parent 00d03622d1
commit 31074d797c
15 changed files with 70 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tv/1systems/cd.nix
View file

@ -24,8 +24,8 @@ with lib;
};
imports = [
../2configs/CAC-Developer-2.nix
../2configs/CAC-CentOS-7-64bit.nix
../2configs/hw/CAC-Developer-2.nix
../2configs/fs/CAC-CentOS-7-64bit.nix
../2configs/base.nix
#../2configs/consul-server.nix
../2configs/exim-smarthost.nix

4
tv/1systems/mkdir.nix
View file

@ -37,8 +37,8 @@ in
};
imports = [
../2configs/CAC-Developer-1.nix
../2configs/CAC-CentOS-7-64bit.nix
../2configs/hw/CAC-Developer-1.nix
../2configs/fs/CAC-CentOS-7-64bit.nix
../2configs/base.nix
../2configs/consul-server.nix
../2configs/exim-smarthost.nix

9
tv/1systems/nomic.nix
View file

@ -24,7 +24,7 @@ with lib;
};
imports = [
../2configs/AO753.nix
../2configs/hw/AO753.nix
../2configs/base.nix
#../2configs/consul-server.nix
../2configs/git.nix
@ -87,13 +87,6 @@ with lib;
swapDevices = [ ];
nix = {
buildCores = 2;
maxJobs = 2;
daemonIONiceLevel = 1;
daemonNiceLevel = 1;
};
# TODO base
boot.tmpOnTmpfs = true;

4
tv/1systems/rmdir.nix
View file

@ -37,8 +37,8 @@ in
};
imports = [
../2configs/CAC-Developer-1.nix
../2configs/CAC-CentOS-7-64bit.nix
../2configs/hw/CAC-Developer-1.nix
../2configs/fs/CAC-CentOS-7-64bit.nix
../2configs/base.nix
../2configs/consul-server.nix
../2configs/exim-smarthost.nix

4
tv/1systems/wu.nix
View file

@ -24,7 +24,7 @@ with lib;
};
imports = [
../2configs/w110er.nix
../2configs/hw/w110er.nix
../2configs/base.nix
#../2configs/consul-client.nix
../2configs/git.nix
@ -389,6 +389,4 @@ with lib;
services.tor.enable = true;
services.virtualboxHost.enable = true;
# TODO w110er if xserver is enabled
services.xserver.vaapiDrivers = [ pkgs.vaapiIntel ];
}

47
tv/2configs/CAC-CentOS-7-64bit.nix
View file

@ -1,47 +0,0 @@
_:
{
boot.loader.grub = {
device = "/dev/sda";
splashImage = null;
};
boot.initrd.availableKernelModules = [
"ata_piix"
"vmw_pvscsi"
];
fileSystems."/" = {
device = "/dev/centos/root";
fsType = "xfs";
};
fileSystems."/boot" = {
device = "/dev/sda1";
fsType = "xfs";
};
swapDevices = [
{ device = "/dev/centos/swap"; }
];
users.extraGroups = {
# ● systemd-tmpfiles-setup.service - Create Volatile Files and Directories
# Loaded: loaded (/nix/store/2l33gg7nmncqkpysq9f5fxyhlw6ncm2j-systemd-217/example/systemd/system/systemd-tmpfiles-setup.service)
# Active: failed (Result: exit-code) since Mon 2015-03-16 10:29:18 UTC; 4s ago
# Docs: man:tmpfiles.d(5)
# man:systemd-tmpfiles(8)
# Process: 19272 ExecStart=/nix/store/2l33gg7nmncqkpysq9f5fxyhlw6ncm2j-systemd-217/bin/systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev (code=exited, status=1/FAILURE)
# Main PID: 19272 (code=exited, status=1/FAILURE)
#
# Mar 16 10:29:17 cd systemd-tmpfiles[19272]: [/usr/lib/tmpfiles.d/legacy.conf:26] Unknown group 'lock'.
# Mar 16 10:29:18 cd systemd-tmpfiles[19272]: Two or more conflicting lines for /var/log/journal configured, ignoring.
# Mar 16 10:29:18 cd systemd-tmpfiles[19272]: Two or more conflicting lines for /var/log/journal/7b35116927d74ea58785e00b47ac0f0d configured, ignoring.
# Mar 16 10:29:18 cd systemd[1]: systemd-tmpfiles-setup.service: main process exited, code=exited, status=1/FAILURE
# Mar 16 10:29:18 cd systemd[1]: Failed to start Create Volatile Files and Directories.
# Mar 16 10:29:18 cd systemd[1]: Unit systemd-tmpfiles-setup.service entered failed state.
# Mar 16 10:29:18 cd systemd[1]: systemd-tmpfiles-setup.service failed.
# warning: error(s) occured while switching to the new configuration
lock.gid = 10001;
};
}

6
tv/2configs/CAC-Developer-1.nix
View file

@ -1,6 +0,0 @@
_:
{
nix.maxJobs = 1;
sound.enable = false;
}

6
tv/2configs/CAC-Developer-2.nix
View file

@ -1,6 +0,0 @@
_:
{
nix.maxJobs = 2;
sound.enable = false;
}

4
tv/2configs/cryptoroot.nix
View file

@ -1,4 +0,0 @@
{ ... }:
{
}

20
tv/2configs/fs/CAC-CentOS-7-64bit.nix Normal file
View file

@ -0,0 +1,20 @@
_:
{
boot.loader.grub = {
device = "/dev/sda";
};
fileSystems = {
"/" = {
device = "/dev/centos/root";
fsType = "xfs";
};
"/boot" = {
device = "/dev/sda1";
fsType = "xfs";
};
};
swapDevices = [
{ device = "/dev/centos/swap"; }
];
}

9
tv/2configs/AO753.nix → tv/2configs/hw/AO753.nix
View file

@ -2,7 +2,7 @@
{
imports = [
../2configs/smartd.nix
../smartd.nix
];
boot.loader.grub = {
@ -25,6 +25,13 @@
networking.wireless.enable = true;
nix = {
buildCores = 2;
maxJobs = 2;
daemonIONiceLevel = 1;
daemonNiceLevel = 1;
};
services.logind.extraConfig = ''
HandleHibernateKey=ignore
HandleLidSwitch=ignore

8
tv/2configs/hw/CAC-Developer-1.nix Normal file
View file

@ -0,0 +1,8 @@
_:
{
imports = [ ./CAC.nix ];
nix = {
buildCores = 1;
maxJobs = 1;
};
}

8
tv/2configs/hw/CAC-Developer-2.nix Normal file
View file

@ -0,0 +1,8 @@
_:
{
imports = [ ./CAC.nix ];
nix = {
buildCores = 2;
maxJobs = 2;
};
}

13
tv/2configs/hw/CAC.nix Normal file
View file

@ -0,0 +1,13 @@
_:
{
boot.initrd.availableKernelModules = [
"ata_piix"
"vmw_pvscsi"
];
boot.loader.grub.splashImage = null;
nix = {
daemonIONiceLevel = 1;
daemonNiceLevel = 1;
};
sound.enable = false;
}

6
tv/2configs/w110er.nix → tv/2configs/hw/w110er.nix
View file

@ -2,7 +2,7 @@
{
imports = [
../2configs/smartd.nix
../smartd.nix
];
boot.extraModprobeConfig = ''
@ -31,6 +31,10 @@
HandleSuspendKey=ignore
'';
services.xserver = {
vaapiDrivers = [ pkgs.vaapiIntel ];
};
system.activationScripts.powertopTunables = ''
echo 1 > /sys/module/snd_hda_intel/parameters/power_save
echo 1500 > /proc/sys/vm/dirty_writeback_centisecs