From 48f99d0516bafae189e7a20e96471d6d6948cd47 Mon Sep 17 00:00:00 2001
From: Andre <andre@8bitbuddhism.com>
Date: Sat, 13 Jul 2024 12:01:13 -0400
Subject: [PATCH] Khanda: downgrade linux-firmware to prevent iwlwifi
 regression

---
 flake.nix                            |  2 ++
 overlays/linux-firmware_20240610.nix | 52 ++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 overlays/linux-firmware_20240610.nix

diff --git a/flake.nix b/flake.nix
index 51dfdf6..ebd4655 100644
--- a/flake.nix
+++ b/flake.nix
@@ -99,6 +99,8 @@
         Khanda = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = defaultModules ++ [
+            # FIXME: Downgrade linux-firmware to fix regression with iwlwifi
+            (import ./overlays/linux-firmware_20240610.nix)
             nixos-hardware.nixosModules.microsoft-surface-pro-9
             ./hosts/Khanda
           ];
diff --git a/overlays/linux-firmware_20240610.nix b/overlays/linux-firmware_20240610.nix
new file mode 100644
index 0000000..c313102
--- /dev/null
+++ b/overlays/linux-firmware_20240610.nix
@@ -0,0 +1,52 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+{
+  nixpkgs.overlays = [
+    (self: super: {
+      linux-firmware = super.callPackage (
+        {
+          stdenvNoCC,
+          fetchzip,
+          lib,
+          rdfind,
+          which,
+        }:
+
+        stdenvNoCC.mkDerivation rec {
+          pname = "linux-firmware";
+          version = "20240610";
+
+          src = fetchzip {
+            url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz";
+            hash = "sha256-tjDqviOMvrBoEG8+Yn+XqdBlIDfQUX0KK2kpW6/jed8=";
+          };
+
+          nativeBuildInputs = [
+            rdfind
+            which
+          ];
+
+          installFlags = [ "DESTDIR=$(out)" ];
+
+          # Firmware blobs do not need fixing and should not be modified
+          dontFixup = true;
+
+          meta = with lib; {
+            description = "Binary firmware collection packaged by kernel.org";
+            homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
+            license = licenses.unfreeRedistributableFirmware;
+            platforms = platforms.linux;
+            maintainers = with maintainers; [ fpletz ];
+            priority = 6; # give precedence to kernel firmware
+          };
+          passthru.updateScript = ./update.sh;
+        }
+      ) { };
+    })
+  ];
+}