From 1514a6502dfeed739a4752652ca5437222110375 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 26 Sep 2017 00:22:53 +0200 Subject: puyak.r: enable fan control --- krebs/1systems/puyak/config.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'krebs/1systems/puyak/config.nix') diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index 978bd18e0..cca8850fa 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -65,7 +65,12 @@ ''; environment.systemPackages = [ pkgs.zsh ]; - boot.kernelModules = [ "kvm-intel" ]; + boot = { + kernelModules = [ "kvm-intel" ]; + extraModprobeConfig = '' + options thinkpad_acpi fan_control=1 + ''; + } users.users.joerg = { openssh.authorizedKeys.keys = [ config.krebs.users.Mic92.pubkey ]; isNormalUser = true; -- cgit v1.2.3 From f1d2f346a3c1bf9df0dda32a5b797169dcb88620 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 26 Sep 2017 00:24:30 +0200 Subject: puyak.r: fan speed to 11 --- krebs/1systems/puyak/config.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'krebs/1systems/puyak/config.nix') diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index cca8850fa..444bf383c 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -71,6 +71,10 @@ options thinkpad_acpi fan_control=1 ''; } + + system.activationScripts."disengage fancontrol" = '' + echo level disengaged > /proc/acpi/ibm/fan + ''; users.users.joerg = { openssh.authorizedKeys.keys = [ config.krebs.users.Mic92.pubkey ]; isNormalUser = true; -- cgit v1.2.3 From c159128c2cb4eb247cdbbacbea2aed4961dbc28d Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 30 Sep 2017 23:13:49 +0200 Subject: puyak.r: fix syntax --- krebs/1systems/puyak/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs/1systems/puyak/config.nix') diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index 444bf383c..ba578512e 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -70,7 +70,7 @@ extraModprobeConfig = '' options thinkpad_acpi fan_control=1 ''; - } + }; system.activationScripts."disengage fancontrol" = '' echo level disengaged > /proc/acpi/ibm/fan -- cgit v1.2.3 From c404a21d1bd03595292ce28e48f13621a5fcc7fb Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 1 Oct 2017 01:32:36 +0200 Subject: puyak.r: merge multiple boot configs --- krebs/1systems/puyak/config.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'krebs/1systems/puyak/config.nix') diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index ba578512e..d2664ef84 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -27,6 +27,11 @@ initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda3"; } ]; initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ]; initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ]; + + kernelModules = [ "kvm-intel" ]; + extraModprobeConfig = '' + options thinkpad_acpi fan_control=1 + ''; }; fileSystems = { @@ -65,12 +70,6 @@ ''; environment.systemPackages = [ pkgs.zsh ]; - boot = { - kernelModules = [ "kvm-intel" ]; - extraModprobeConfig = '' - options thinkpad_acpi fan_control=1 - ''; - }; system.activationScripts."disengage fancontrol" = '' echo level disengaged > /proc/acpi/ibm/fan -- cgit v1.2.3