From 1ebb22cd3c2afd3d6f4ab847f3c1523f1c85563e Mon Sep 17 00:00:00 2001
From: Andre <andre@8bitbuddhism.com>
Date: Wed, 21 Aug 2024 17:05:55 -0400
Subject: [PATCH] Khanda: blacklist problematic camera module and re-try kernel
 6.10

---
 flake.lock                              | 17 -----------------
 flake.nix                               |  5 +----
 hosts/Khanda/hardware-configuration.nix |  9 +++++++--
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8508d9f..502c056 100644
--- a/flake.lock
+++ b/flake.lock
@@ -263,22 +263,6 @@
         "type": "github"
       }
     },
-    "nixos-hardware-surface": {
-      "locked": {
-        "lastModified": 1722332872,
-        "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=",
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "rev": "14c333162ba53c02853add87a0000cbd7aa230c2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "rev": "14c333162ba53c02853add87a0000cbd7aa230c2",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1717794163,
@@ -378,7 +362,6 @@
         "nix-flatpak": "nix-flatpak",
         "nix-secrets": "nix-secrets",
         "nixos-hardware": "nixos-hardware",
-        "nixos-hardware-surface": "nixos-hardware-surface",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
diff --git a/flake.nix b/flake.nix
index 0765755..54f51bb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,8 +26,6 @@
 
     # NixOS hardware quirks
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
-    # FIXME: Khanda fails to boot when using kernel 6.10+. This is a workaround.
-    nixos-hardware-surface.url = "github:NixOS/nixos-hardware?ref=14c333162ba53c02853add87a0000cbd7aa230c2";
 
     # Home-manager support
     home-manager = {
@@ -49,7 +47,6 @@
       lix-module,
       nix-flatpak,
       nixos-hardware,
-      nixos-hardware-surface,
       nixpkgs,
       nixpkgs-unstable,
       nix-secrets,
@@ -112,7 +109,7 @@
         Khanda = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = defaultModules ++ [
-            nixos-hardware-surface.nixosModules.microsoft-surface-pro-9
+            nixos-hardware.nixosModules.microsoft-surface-pro-9
             ./hosts/Khanda
           ];
         };
diff --git a/hosts/Khanda/hardware-configuration.nix b/hosts/Khanda/hardware-configuration.nix
index 6813c92..d396a7b 100644
--- a/hosts/Khanda/hardware-configuration.nix
+++ b/hosts/Khanda/hardware-configuration.nix
@@ -96,12 +96,17 @@ in
   hardware = {
     cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
     # Enable camera driver
-    # NOTE: Currently results in a build failure. For updates, see https://github.com/NixOS/nixpkgs/issues/303067
+    # NOTE: Results in a kernel panic on 6.10 kernels. See https://github.com/linux-surface/linux-surface/issues/1516
+    # ALSO: This causes a build failure on NixOS anyway. ee https://github.com/NixOS/nixpkgs/issues/303067
     ipu6 = {
-      enable = true;
+      enable = false;
       platform = "ipu6ep";
     };
   };
+  boot.blacklistedKernelModules = [
+    "intel-ipu6"
+    "intel-ipu6-isys"
+  ];
 
   # Install/configure additional drivers, particularly for touch
   environment.systemPackages = with pkgs; [ libwacom-surface ];