From 2429ddfa1a5a14cf4e969992461dc1ad4a8b2ec9 Mon Sep 17 00:00:00 2001
From: Spotlight <spotlight@joscomputing.space>
Date: Tue, 25 Mar 2025 22:13:11 -0500
Subject: [PATCH 1/2] Remove gcc-arm-embedded

This is better fit to be used within specific projects, and not globally throughout user programs.
---
 home/desktop.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/home/desktop.nix b/home/desktop.nix
index 91b3437..4cacf9e 100644
--- a/home/desktop.nix
+++ b/home/desktop.nix
@@ -14,7 +14,6 @@
     dmg2img
     exiftool
     ffmpeg-full
-    gcc-arm-embedded
     go
     google-cloud-sdk
     htop

From 5081abc100d6fa8b781998281ad7d3d53ac305f4 Mon Sep 17 00:00:00 2001
From: Spotlight <spotlight@joscomputing.space>
Date: Tue, 25 Mar 2025 22:59:56 -0500
Subject: [PATCH 2/2] spotlights-macbook-air: Use PR for nixos-apple-silicon

This resolves some issues with using Asahi's Mesa upstream currently.
---
 flake.lock | 19 ++++++++++---------
 flake.nix  |  4 +++-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index eb00430..af84a22 100644
--- a/flake.lock
+++ b/flake.lock
@@ -24,15 +24,16 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1742098834,
-        "narHash": "sha256-l98XVpNXW6hr0AsxCeQZbdf6EGT8OpHdkWBi7sdel4s=",
+        "lastModified": 1742316137,
+        "narHash": "sha256-W0jd5FoOuQUnpBrAc7H/EoXrq9FpcR88ZfcqMU5MXBw=",
         "owner": "tpwrules",
         "repo": "nixos-apple-silicon",
-        "rev": "8457960249bcfd34c22838e20eaa7d8261428688",
+        "rev": "f51de44b1d720ac23e838db8e0cf13fadb7942b8",
         "type": "github"
       },
       "original": {
         "owner": "tpwrules",
+        "ref": "pull/284/head",
         "repo": "nixos-apple-silicon",
         "type": "github"
       }
@@ -92,11 +93,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742851132,
-        "narHash": "sha256-8vEcDefstheV1whup+5fSpZu4g9Jr7WpYzOBKAMSHn4=",
+        "lastModified": 1742957044,
+        "narHash": "sha256-gwW0tBIA77g6qq45y220drTy0DmThF3fJMwVFUtYV9c=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c4d5d72805d14ea43c140eeb70401bf84c0f11b4",
+        "rev": "ce287a5cd3ef78203bc78021447f937a988d9f6f",
         "type": "github"
       },
       "original": {
@@ -127,11 +128,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742741935,
-        "narHash": "sha256-ZCNvPYWkL9hxzgWn1gmYCZItqBU4ujsWjwWNpcwCjfQ=",
+        "lastModified": 1742869675,
+        "narHash": "sha256-rgwUZJZVztaNYPTsf6MIqirPL5r2JTMMyHuzk1ezyYk=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "ebb88c3428dcdd95c06dca4d49b9791a65ab777b",
+        "rev": "bb81755a3674951724d79b8cba6bbff01409d44d",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index a647382..ec79d27 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,9 @@
     # Specify the source of Home Manager and Nixpkgs.
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     apple-silicon-support = {
-      url = "github:tpwrules/nixos-apple-silicon";
+      # Temporarily use https://github.com/tpwrules/nixos-apple-silicon/pull/284
+      # due to Mesa changes upstream necessary for functional Vulkan.
+      url = "github:tpwrules/nixos-apple-silicon?ref=pull/284/head";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     # Allows for easy enumeration of available Darwin and Linux systems.