diff options
| author | lassulus <lassulus@lassul.us> | 2017-10-01 01:32:36 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-10-01 01:32:36 +0200 |
| commit | c404a21d1bd03595292ce28e48f13621a5fcc7fb (patch) | |
| tree | 85f8f2062f01bde802071f501b2ce2854048df10 /krebs/1systems/puyak | |
| parent | c159128c2cb4eb247cdbbacbea2aed4961dbc28d (diff) | |
puyak.r: merge multiple boot configs
Diffstat (limited to 'krebs/1systems/puyak')
| -rw-r--r-- | krebs/1systems/puyak/config.nix | 11 |
1 files changed, 5 insertions, 6 deletions
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 |