From 9051b6d6015a105cf532b245fd4db75ac6be0e98 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 26 Sep 2018 17:54:12 +0200
Subject: ...

---
 hel/boot.nix | 11 +++++++++--
 hel/hw.nix   |  4 ----
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'hel')

diff --git a/hel/boot.nix b/hel/boot.nix
index b7cc0429..41452166 100644
--- a/hel/boot.nix
+++ b/hel/boot.nix
@@ -2,8 +2,15 @@
 
 {
   boot = {
-    initrd.luks.devices = [ { name = "ssd"; device = "/dev/disk/by-uuid/9e9e430c-f9cd-418e-b66b-60f81ba9293b"; }
-                          ];
+    initrd = {
+      luks.devices = [ { name = "ssd"; device = "/dev/disk/by-uuid/9e9e430c-f9cd-418e-b66b-60f81ba9293b"; }
+                     ];
+      availableKernelModules = [ "fbcon" "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+    };
+
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+
     loader = {
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
diff --git a/hel/hw.nix b/hel/hw.nix
index d8c9df4c..16216fe6 100644
--- a/hel/hw.nix
+++ b/hel/hw.nix
@@ -5,10 +5,6 @@
     [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
   fileSystems."/" =
     { device = "/dev/hel/btrfs";
       fsType = "btrfs";
-- 
cgit v1.2.3