From fdda096e64193e7f008e1173da739e5f28c4bc41 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Mon, 17 Feb 2020 21:50:13 +0100 Subject: [PATCH] Move early KMS start definition to machine-specific hardware configuration --- machines/pentos/hardware.nix | 3 ++- profiles/graphical/default.nix | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/machines/pentos/hardware.nix b/machines/pentos/hardware.nix index 5f9c9744..fe7e4ac6 100644 --- a/machines/pentos/hardware.nix +++ b/machines/pentos/hardware.nix @@ -4,7 +4,8 @@ imports = [ ]; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ ]; + # Early KMS start + boot.initrd.kernelModules = [ "i915" ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; diff --git a/profiles/graphical/default.nix b/profiles/graphical/default.nix index 27a28958..1b98b94c 100644 --- a/profiles/graphical/default.nix +++ b/profiles/graphical/default.nix @@ -15,9 +15,6 @@ plugins = [ pkgs.ccid ]; }; - # Early KMS start - boot.initrd.kernelModules = [ "i915" ]; - sound.enable = true; hardware.pulseaudio.enable = true;