From c88767756017c69c684f24a817f3290e51933572 Mon Sep 17 00:00:00 2001
From: Michael Thomas <michaelhthomas@outlook.com>
Date: Fri, 2 Aug 2024 09:45:18 -0400
Subject: [PATCH] fix(mac): install spicetify from nixpkgs master

---
 flake.lock                     | 16 ++++++++++++++++
 flake.nix                      |  1 +
 machines/mac/configuration.nix |  2 +-
 overlays/default.nix           |  9 +++++++--
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 052e768..6aedead 100644
--- a/flake.lock
+++ b/flake.lock
@@ -501,6 +501,21 @@
         "type": "github"
       }
     },
+    "master": {
+      "locked": {
+        "lastModified": 1722605938,
+        "narHash": "sha256-jEpnC5ChZozKqSQ0PCpd1f+nN7A/7d45MV0I/20gcS8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8f3018de97f0b078911e217be698a67c83557b5a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -700,6 +715,7 @@
         "flake-parts": "flake-parts",
         "home-manager": "home-manager_2",
         "hyprland": "hyprland",
+        "master": "master",
         "nix-vscode-extensions": "nix-vscode-extensions",
         "nixpkgs": "nixpkgs_4",
         "nixvim": "nixvim",
diff --git a/flake.nix b/flake.nix
index 3e2cb28..c5e4934 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,7 @@
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-24.05";
     unstable.url = "nixpkgs/nixos-unstable";
+    master.url = "github:NixOS/nixpkgs";
     nur.url = "github:nix-community/NUR";
 
     home-manager = {
diff --git a/machines/mac/configuration.nix b/machines/mac/configuration.nix
index 47514eb..f56efff 100644
--- a/machines/mac/configuration.nix
+++ b/machines/mac/configuration.nix
@@ -27,7 +27,7 @@
       # Video
       ffmpeg
       # Spotify
-      unstable.spicetify-cli
+      master.spicetify-cli
       # Java
       checkstyle
       # XCode
diff --git a/overlays/default.nix b/overlays/default.nix
index b9cb445..b0c50b4 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -5,7 +5,7 @@
   # This one brings our custom packages from the 'pkgs' directory
   additions = final: _prev:
     import ../pkgs {
-      pkgs = final.pkgs;
+      inherit (final) pkgs;
       inherit inputs;
     };
 
@@ -22,7 +22,12 @@
   # be accessible through 'pkgs.unstable'
   unstable-packages = final: _prev: {
     unstable = import inputs.unstable {
-      system = final.system;
+      inherit (final) system;
+      config.allowUnfree = true;
+    };
+
+    master = import inputs.master {
+      inherit (final) system;
       config.allowUnfree = true;
     };
   };