From b1a0cb9247a1000dc17bcd7f14ec801a8a98c770 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sun, 17 Sep 2017 20:30:47 +0200
Subject: intel-gpu: Use i915 to setup console earlier

---
 modules/grub2.nix     | 1 -
 modules/intel-gpu.nix | 8 ++++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/grub2.nix b/modules/grub2.nix
index be78a60c..6eaa8cc5 100644
--- a/modules/grub2.nix
+++ b/modules/grub2.nix
@@ -9,5 +9,4 @@
     };
     efi.canTouchEfiVariables = true;
   };
-  boot.earlyVconsoleSetup = true;
 }
diff --git a/modules/intel-gpu.nix b/modules/intel-gpu.nix
index 775396ae..b44ddadf 100644
--- a/modules/intel-gpu.nix
+++ b/modules/intel-gpu.nix
@@ -3,4 +3,12 @@
 { hardware.opengl.extraPackages = with pkgs; [
     vaapiIntel
   ];
+
+  boot.earlyVconsoleSetup = true;
+  boot.initrd.kernelModules = [
+    "i915"
+  ];
+  boot.kernelModules = [
+    "i915"
+  ];
 }
-- 
cgit 1.4.1