From 874fcbd7cee5ce108add0dc204d44509ba4b5805 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 31 Aug 2016 17:35:57 +0200
Subject: [PATCH] steveej-laptop: use default kernel

---
 configuration/steveej-laptop/boot.nix | 36 ++++++++++++++++++++++++++-
 configuration/steveej-laptop/hw.nix   |  2 --
 configuration/steveej-laptop/pkg.nix  |  1 -
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/configuration/steveej-laptop/boot.nix b/configuration/steveej-laptop/boot.nix
index badccb4..70ee1ad 100644
--- a/configuration/steveej-laptop/boot.nix
+++ b/configuration/steveej-laptop/boot.nix
@@ -1,7 +1,41 @@
 { 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
   boot.loader.grub.enable = true;
diff --git a/configuration/steveej-laptop/hw.nix b/configuration/steveej-laptop/hw.nix
index 4a99e58..9b4c429 100644
--- a/configuration/steveej-laptop/hw.nix
+++ b/configuration/steveej-laptop/hw.nix
@@ -10,8 +10,6 @@
     hardware.enableAllFirmware = true;
     hardware.trackpoint.emulateWheel = true;
 
-    boot.kernelPackages = pkgs.myLinuxPackages;
-
     boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "sd_mod" ];
     boot.kernelModules = [ "kvm-intel" ];
     boot.extraModulePackages = [ ];
diff --git a/configuration/steveej-laptop/pkg.nix b/configuration/steveej-laptop/pkg.nix
index 488b825..02a009d 100644
--- a/configuration/steveej-laptop/pkg.nix
+++ b/configuration/steveej-laptop/pkg.nix
@@ -111,7 +111,6 @@ in
     x11_ssh_askpass
     gnome3.dconf # needed by virtmanager
     virtmanager
-    myLinuxPackages.virtualbox
     qemu
     vagrant