From 1f2e9434b8abb9686178b2eaa79e992835d925f0 Mon Sep 17 00:00:00 2001
From: Sean Kovacs <kovacsmillio@gmail.com>
Date: Sun, 14 Dec 2025 13:09:51 -0500
Subject: [PATCH] use upstream equivalent of linux-6.17-11 declaration

---
 flake.lock                                |  7 +--
 flake.nix                                 |  2 +-
 packages/linux-asahi-bleeding/package.nix | 63 -----------------------
 packages/overlay.nix                      |  2 -
 4 files changed, 5 insertions(+), 69 deletions(-)
 delete mode 100644 packages/linux-asahi-bleeding/package.nix

diff --git a/flake.lock b/flake.lock
index 7c046f4..18d7a57 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,15 +8,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1765528634,
-        "narHash": "sha256-uIavvJkDwTZD1QY/oSkDtPN9xwkLwQayoZ5xOni4SBY=",
+        "lastModified": 1765530480,
+        "narHash": "sha256-JdEucq+zm6pAol40wB+7Cu464sn5SSKXjxBOe+XkWck=",
         "owner": "nix-community",
         "repo": "nixos-apple-silicon",
-        "rev": "fc1440d6e6adb24d9b2650670744bae35654c867",
+        "rev": "e7c623629d0c1d2556b57e34edcc18f6d5d123cb",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "linux-6-17-11",
         "repo": "nixos-apple-silicon",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 9bf8615..e8e314f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,7 +45,7 @@
     };
 
     apple-silicon = {
-      url = "github:nix-community/nixos-apple-silicon";
+      url = "github:nix-community/nixos-apple-silicon/linux-6-17-11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
diff --git a/packages/linux-asahi-bleeding/package.nix b/packages/linux-asahi-bleeding/package.nix
deleted file mode 100644
index f9610fb..0000000
--- a/packages/linux-asahi-bleeding/package.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  lib,
-  callPackage,
-  linuxPackagesFor,
-  _kernelPatches ? [ ],
-}:
-
-let
-  linux-asahi-pkg =
-    {
-      stdenv,
-      lib,
-      fetchFromGitHub,
-      buildLinux,
-      ...
-    }:
-    buildLinux rec {
-      inherit stdenv lib;
-
-      pname = "linux-asahi";
-      version = "6.17.11";
-      modDirVersion = version;
-      extraMeta.branch = "6.17";
-
-      src = fetchFromGitHub {
-        owner = "AsahiLinux";
-        repo = "linux";
-        tag = "asahi-6.17.11-1";
-        hash = "sha256-bTptFNR7ehMdW3M05c0S6GZ4H19GCYvplso8zOkEnmQ=";
-      };
-
-      kernelPatches = [
-        {
-          name = "Asahi config";
-          patch = null;
-          structuredExtraConfig = with lib.kernel; {
-            # Needed for GPU
-            ARM64_16K_PAGES = yes;
-
-            ARM64_MEMORY_MODEL_CONTROL = yes;
-            ARM64_ACTLR_STATE = yes;
-
-            # Might lead to the machine rebooting if not loaded soon enough
-            APPLE_WATCHDOG = yes;
-
-            # Can not be built as a module, defaults to no
-            APPLE_M1_CPU_PMU = yes;
-
-            # Defaults to 'y', but we want to allow the user to set options in modprobe.d
-            HID_APPLE = module;
-
-            APPLE_PMGR_MISC = yes;
-            APPLE_PMGR_PWRSTATE = yes;
-          };
-          features.rust = true;
-        }
-      ]
-      ++ _kernelPatches;
-    };
-
-  linux-asahi = callPackage linux-asahi-pkg { };
-in
-lib.recurseIntoAttrs (linuxPackagesFor linux-asahi)
diff --git a/packages/overlay.nix b/packages/overlay.nix
index 84be97b..71bf926 100644
--- a/packages/overlay.nix
+++ b/packages/overlay.nix
@@ -24,8 +24,6 @@ final: prev: {
       inherit helium-widevine;
     };
 
-  linux-asahi = prev.callPackage (builtins.path { path = ./linux-asahi-bleeding/package.nix; }) { };
-
   spotifyd = prev.callPackage (builtins.path { path = ./spotifyd/package.nix; }) { };
 
   widevine-firefox = prev.callPackage (builtins.path { path = ./widevine-firefox/package.nix; }) { };