From c54e75331d1895b446cd4ff032ae7db7349af4e6 Mon Sep 17 00:00:00 2001
From: Katharina Fey <kookie@spacekookie.de>
Date: Sat, 4 Sep 2021 15:42:22 +0200
Subject: [PATCH] libkookie: include manjaro kernel configuration

---
 infra/libkookie/overlays/default.nix | 2 ++
 infra/libkookie/roots/tempest.nix    | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/infra/libkookie/overlays/default.nix b/infra/libkookie/overlays/default.nix
index 697ab3a68e1..312c4e59118 100644
--- a/infra/libkookie/overlays/default.nix
+++ b/infra/libkookie/overlays/default.nix
@@ -24,6 +24,8 @@ self: super: {
   htop = self.callPackage ./patches/htop { inherit (super) htop; };
   iosevka = self.callPackage ./patches/iosevka { inherit (super) iosevka; };
   any-nix-shell = self.callPackage ./patches/any-nix-shell { inherit (super) any-nix-shell; };
+
+  manjaro-kernel = self.callPackage ./patches/manjaro-kernel { inherit (super) fetchgit runCommand linuxPackages_custom; };
 }
 
 ## Include the rust overlay
diff --git a/infra/libkookie/roots/tempest.nix b/infra/libkookie/roots/tempest.nix
index bff54f5ef3a..98b1a16822a 100644
--- a/infra/libkookie/roots/tempest.nix
+++ b/infra/libkookie/roots/tempest.nix
@@ -122,6 +122,12 @@ in
     [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "nvme" "nvme_core" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelPackages = with pkgs; linuxPackagesFor manjaro-kernel;
+  boot.kernelParams = [
+    "boot.debug1devices"
+    "pstore_blk.blkdev=/dev/sdc1"
+    "best_effort=y"
+  ];
   boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
 
   services.zfs.autoSnapshot.enable = true;