From 93a8ecc35e60c23ce5e1924e4899f162952e4dcc Mon Sep 17 00:00:00 2001
From: Michael Thomas <michaelhthomas@outlook.com>
Date: Mon, 27 Feb 2023 15:13:12 -0500
Subject: [PATCH] fix: use latest spicetify version

---
 flake.nix                      | 9 ++++++++-
 machines/mac/configuration.nix | 2 +-
 overlays/default.nix           | 7 +------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index c1959ad..b194831 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,10 +34,16 @@
     # If you want to use packages from flakes that are not nixpkgs (such as NUR), add their overlays here.\
     overlays = {
       default = import ./overlays inputs;
+      pkg-sets = (
+        final: prev: {
+          unstable = import inputs.unstable { system = final.system; };
+          trunk = import inputs.trunk { system = final.system; };
+        }
+      );
     };
 
     overlaysModule = {
-      nixpkgs.overlays = [ self.overlays.default ];
+      nixpkgs.overlays = builtins.attrValues self.overlays;
     };
 
     nixosConfigurations = {
@@ -95,6 +101,7 @@
         system = "aarch64-darwin";
         specialArgs = { inherit inputs; };
         modules = [
+          self.overlaysModule
           home-manager.darwinModules.home-manager
           {
             home-manager.useGlobalPkgs = true;
diff --git a/machines/mac/configuration.nix b/machines/mac/configuration.nix
index 6e3c729..13505c7 100644
--- a/machines/mac/configuration.nix
+++ b/machines/mac/configuration.nix
@@ -28,7 +28,7 @@
       # Video
       ffmpeg
       # Spotify
-      spicetify-cli
+      unstable.spicetify-cli
       # Java
       checkstyle
     ];
diff --git a/overlays/default.nix b/overlays/default.nix
index 78b9a43..d3d7d72 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -3,13 +3,8 @@
 let
   inherit (nixpkgs.lib) composeManyExtensions;
   inherit (builtins) attrNames readDir;
-	overlay-unstable = self: super: {
-		unstable = unstable.legacyPackages.x86_64-linux;
-	};
   localOverlays = map
     (f: import (./default + "/${f}"))
     (attrNames (readDir ./default));
 in
-composeManyExtensions (localOverlays ++ [
-	overlay-unstable
-])
\ No newline at end of file
+composeManyExtensions (localOverlays)