From 7b24ac3edb8003e04ef110000710ffa3b432fa63 Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Sun, 23 Nov 2025 11:17:36 -0500
Subject: [PATCH] locked linux-firmware and 6.12.52

---
 common/global/default.nix                  | 17 ++++++++++++++++-
 flake.lock                                 | 17 +++++++++++++++++
 flake.nix                                  |  3 +++
 systems/jeeves/linux-firmware-20251011.nix | 11 +++++++++++
 4 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 systems/jeeves/linux-firmware-20251011.nix

diff --git a/common/global/default.nix b/common/global/default.nix
index 3134a4e..d46e033 100644
--- a/common/global/default.nix
+++ b/common/global/default.nix
@@ -22,7 +22,22 @@
 
   boot = {
     tmp.useTmpfs = true;
-    kernelPackages = lib.mkDefault pkgs.linuxPackages_6_12;
+    kernelPackages = lib.mkDefault (
+      pkgs.linuxPackages_6_12.extend (
+        self: super: {
+          kernel = super.kernel.override {
+            argsOverride = {
+              version = "6.12.52";
+              modDirVersion = "6.12.52";
+              src = pkgs.fetchurl {
+                url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.12.52.tar.xz";
+                sha256 = "sha256-tIUM9nCgMscPOLcTon1iBGxfdHyvAoxfULGPmGBqnrE=";
+              };
+            };
+          };
+        }
+      )
+    );
     zfs.package = lib.mkDefault pkgs.zfs_2_3;
   };
 
diff --git a/flake.lock b/flake.lock
index 0d6292d..bc8a99a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -74,6 +74,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-linux-firmware-20251011": {
+      "locked": {
+        "lastModified": 1760099975,
+        "narHash": "sha256-/fXH2TIVxVgmBbPouQNMsEPfUFB8Z9n6T9t40HMeC/k=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f9430900368d5a7346e30e6ecc7b26c9f7cc35cf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f9430900368d5a7346e30e6ecc7b26c9f7cc35cf",
+        "type": "github"
+      }
+    },
     "nixpkgs-master": {
       "locked": {
         "lastModified": 1763774007,
@@ -112,6 +128,7 @@
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-linux-firmware-20251011": "nixpkgs-linux-firmware-20251011",
         "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-stable": "nixpkgs-stable",
         "sops-nix": "sops-nix",
diff --git a/flake.nix b/flake.nix
index 0d673cb..bdfa4ff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,6 +19,8 @@
     nixpkgs-master.url = "github:nixos/nixpkgs/master";
     systems.url = "github:nix-systems/default-linux";
 
+    nixpkgs-linux-firmware-20251011.url = "github:NixOS/nixpkgs/f9430900368d5a7346e30e6ecc7b26c9f7cc35cf";
+
     nixos-hardware.url = "github:nixos/nixos-hardware/master";
 
     home-manager = {
@@ -82,6 +84,7 @@
         jeeves = lib.nixosSystem {
           modules = [
             ./systems/jeeves
+            ./systems/jeeves/linux-firmware-20251011.nix
           ];
           specialArgs = { inherit inputs outputs; };
         };
diff --git a/systems/jeeves/linux-firmware-20251011.nix b/systems/jeeves/linux-firmware-20251011.nix
new file mode 100644
index 0000000..cc3306d
--- /dev/null
+++ b/systems/jeeves/linux-firmware-20251011.nix
@@ -0,0 +1,11 @@
+{ inputs, ... }:
+
+let
+  linuxFirmwareOverlay = final: prev: {
+    linux-firmware =
+      inputs.nixpkgs-linux-firmware-20251011.legacyPackages.${final.system}.linux-firmware;
+  };
+in
+{
+  nixpkgs.overlays = [ linuxFirmwareOverlay ];
+}