From f4cc132c6e5ff9d894c012c29f46ffeb44796baa Mon Sep 17 00:00:00 2001
From: Andre <andre@8bitbuddhism.com>
Date: Sun, 15 Dec 2024 13:07:27 -0500
Subject: [PATCH] Khanda: test kernel 6.12

---
 flake.lock                                           | 12 ++++++------
 flake.nix                                            |  3 ++-
 .../x86_64-linux/Khanda/hardware-configuration.nix   | 12 ++++++++----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7b436bd..72cc879 100644
--- a/flake.lock
+++ b/flake.lock
@@ -261,16 +261,16 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1733861262,
-        "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=",
-        "owner": "NixOS",
+        "lastModified": 1734207752,
+        "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=",
+        "owner": "matthiasdotsh",
         "repo": "nixos-hardware",
-        "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5",
+        "rev": "4a6a098803d4050471e9d8085afca86bd1ae9a9e",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "master",
+        "owner": "matthiasdotsh",
+        "ref": "ms-surface/update-kernel-6.12.4",
         "repo": "nixos-hardware",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 73b13ed..032c960 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,7 +31,8 @@
     };
 
     # NixOS hardware quirks
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    #nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    nixos-hardware.url = "github:matthiasdotsh/nixos-hardware/ms-surface/update-kernel-6.12.4";
 
     # Snowfall lib: https://snowfall.org/guides/lib/quickstart/
     # Jake's reference config: https://github.com/jakehamilton/config
diff --git a/systems/x86_64-linux/Khanda/hardware-configuration.nix b/systems/x86_64-linux/Khanda/hardware-configuration.nix
index 5e0d3ce..d843b28 100644
--- a/systems/x86_64-linux/Khanda/hardware-configuration.nix
+++ b/systems/x86_64-linux/Khanda/hardware-configuration.nix
@@ -71,10 +71,14 @@ in
 
   hardware = {
     cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-    ipu6 = {
-      enable = true;
-      platform = "ipu6ep";
-    };
+    /*
+      FIXME: temporarily disable due to conflict with kernel 6.12+
+
+      ipu6 = {
+        enable = true;
+        platform = "ipu6ep";
+      };
+    */
   };
 
   # Limit the number of cores Nix can use