diff options
| -rw-r--r-- | machines/aszlig/tishtushi.nix | 27 | ||||
| -rw-r--r-- | modules/hardware/t100ha/default.nix | 3 | ||||
| -rw-r--r-- | modules/user/aszlig/system/kernel.nix | 11 |
3 files changed, 17 insertions, 24 deletions
diff --git a/machines/aszlig/tishtushi.nix b/machines/aszlig/tishtushi.nix index 2b1304d2..a4408487 100644 --- a/machines/aszlig/tishtushi.nix +++ b/machines/aszlig/tishtushi.nix @@ -12,23 +12,22 @@ in { vuizvui.user.aszlig.programs.taalo-build.enable = true; boot = rec { + kernelPatches = singleton { + name = "bfqsched"; + patch = pkgs.fetchpatch { + name = "cfq-replacement.patch"; + url = "https://github.com/linusw/linux-bfq/compare/" + + "29b4817d4018df78086157ea3a55c1d9424a7cfc" + + "...cfq_replacement-logical.patch"; + sha256 = "1b3n287r31g0sn85f88dmd00wlsccnm90mr5sr8lj4g1fvnfswqv"; + }; + }; + kernelPackages = with pkgs; let trimVer = ver: take 2 (splitString "." (replaceChars ["-"] ["."] ver)); tooOld = trimVer linux_latest.version == trimVer linux_testing.version; - origKernel = if tooOld then linux_latest else linux_testing; - kernel = origKernel.override (origArgs: { - kernelPatches = origArgs.kernelPatches ++ singleton { - name = "bfqsched"; - patch = pkgs.fetchpatch { - name = "cfq-replacement.patch"; - url = "https://github.com/linusw/linux-bfq/compare/" - + "29b4817d4018df78086157ea3a55c1d9424a7cfc" - + "...cfq_replacement-logical.patch"; - sha256 = "1b3n287r31g0sn85f88dmd00wlsccnm90mr5sr8lj4g1fvnfswqv"; - }; - }; - }); - in linuxPackagesFor kernel kernelPackages; + kernel = if tooOld then linux_latest else linux_testing; + in linuxPackagesFor kernel; initrd.kernelModules = [ "fbcon" "usb_storage" ]; loader.grub.device = "/dev/disk/by-id/${diskID}"; diff --git a/modules/hardware/t100ha/default.nix b/modules/hardware/t100ha/default.nix index 90385327..3a209777 100644 --- a/modules/hardware/t100ha/default.nix +++ b/modules/hardware/t100ha/default.nix @@ -68,8 +68,7 @@ in { INTEL_MEI_TXE y ''; }; - self = pkgs.linuxPackagesFor t100haKernel self; - in self; + in pkgs.linuxPackagesFor t100haKernel; # By default the console is rotated by 90 degrees to the right. boot.kernelParams = [ "fbcon=rotate:3" ]; diff --git a/modules/user/aszlig/system/kernel.nix b/modules/user/aszlig/system/kernel.nix index c51abba5..120a6c08 100644 --- a/modules/user/aszlig/system/kernel.nix +++ b/modules/user/aszlig/system/kernel.nix @@ -41,17 +41,12 @@ in { }; config = mkIf cfg.enable { - boot = let - linuxVuizvui = pkgs.buildLinux { + boot = { + kernelPatches = singleton pkgs.vuizvui.kernelPatches.bfqsched; + kernelPackages = pkgs.linuxPackages_custom { inherit (mainlineKernel) version src; - - kernelPatches = singleton pkgs.vuizvui.kernelPatches.bfqsched; configfile = generateKConf cfg.config; - allowImportFromDerivation = true; }; - in rec { - kernelPackages = pkgs.recurseIntoAttrs - (pkgs.linuxPackagesFor linuxVuizvui kernelPackages); }; }; } |