From c404a21d1bd03595292ce28e48f13621a5fcc7fb Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
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')

diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix
index ba578512..d2664ef8 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