steveej-laptop: use default kernel
This commit is contained in:
parent
dcf4cdd88b
commit
874fcbd7ce
3 changed files with 35 additions and 4 deletions
|
@ -1,7 +1,41 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
boot.kernelPackages = pkgs.myLinuxPackages;
|
#boot.kernelPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor
|
||||||
|
# (pkgs.linux_latest.override {
|
||||||
|
# kernelPatches = pkgs.linux_latest.kernelPatches ++ [
|
||||||
|
# {
|
||||||
|
# name = "bfq1";
|
||||||
|
# patch = pkgs.fetchurl {
|
||||||
|
# url = "ftp://teambelgium.net/bfq/patches/4.5.0-v7r11/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.5.0.patch";
|
||||||
|
# sha256 = "1j6h831kj32c9slzm4vhjvd8m17gbwh713kcpc54z9i02fwyq6ax";
|
||||||
|
# };
|
||||||
|
# }
|
||||||
|
# {
|
||||||
|
# name = "bfq2";
|
||||||
|
# patch = pkgs.fetchurl {
|
||||||
|
# url = "ftp://teambelgium.net/bfq/patches/4.5.0-v7r11/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.5.0.patch";
|
||||||
|
# sha256 = "1q8nf7fcp72s2xz2pfl22sv4w5fm4hzgciljrkd3g7gj5xvi27lw";
|
||||||
|
# };
|
||||||
|
# }
|
||||||
|
# {
|
||||||
|
# name = "bfq3";
|
||||||
|
# patch = pkgs.fetchurl {
|
||||||
|
# url = "ftp://teambelgium.net/bfq/patches/4.5.0-v7r11/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch";
|
||||||
|
# sha256 = "1q2j7g3cfwi52psxgwa06hadl6c2fh87ckm07pyaj35n6524gjg0";
|
||||||
|
# };
|
||||||
|
# }
|
||||||
|
# ];
|
||||||
|
# extraConfig = ''
|
||||||
|
# BFQ_GROUP_IOSCHED y
|
||||||
|
# IOSCHED_BFQ y
|
||||||
|
# DEFAULT_BFQ y
|
||||||
|
# '';
|
||||||
|
# })
|
||||||
|
# pkgs.linuxPackages_latest
|
||||||
|
#);
|
||||||
|
|
||||||
|
boot.kernelPackages = pkgs.linuxPackages_4_6;
|
||||||
|
|
||||||
# Bootloader, initrd and Kernel
|
# Bootloader, initrd and Kernel
|
||||||
boot.loader.grub.enable = true;
|
boot.loader.grub.enable = true;
|
||||||
|
|
|
@ -10,8 +10,6 @@
|
||||||
hardware.enableAllFirmware = true;
|
hardware.enableAllFirmware = true;
|
||||||
hardware.trackpoint.emulateWheel = true;
|
hardware.trackpoint.emulateWheel = true;
|
||||||
|
|
||||||
boot.kernelPackages = pkgs.myLinuxPackages;
|
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "sd_mod" ];
|
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "sd_mod" ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
|
@ -111,7 +111,6 @@ in
|
||||||
x11_ssh_askpass
|
x11_ssh_askpass
|
||||||
gnome3.dconf # needed by virtmanager
|
gnome3.dconf # needed by virtmanager
|
||||||
virtmanager
|
virtmanager
|
||||||
myLinuxPackages.virtualbox
|
|
||||||
qemu
|
qemu
|
||||||
vagrant
|
vagrant
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue