From 30aba48973261e0a35c3f7e5da3cff086c5e6d97 Mon Sep 17 00:00:00 2001
From: ItsDrike <itsdrike@protonmail.com>
Date: Wed, 17 Jul 2024 10:59:30 +0200
Subject: [PATCH] Re-enable spicetify spotify (move to fork)

---
 flake.lock                                    | 61 +++++++------------
 flake.nix                                     |  2 +-
 .../graphical/apps/spotify/default.nix        | 57 ++++++++++-------
 hosts/voyager/default.nix                     |  2 +-
 4 files changed, 59 insertions(+), 63 deletions(-)

diff --git a/flake.lock b/flake.lock
index 12472b6..7679f22 100644
--- a/flake.lock
+++ b/flake.lock
@@ -87,6 +87,22 @@
         "type": "github"
       }
     },
+    "flake-compat_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -207,24 +223,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -599,21 +597,21 @@
     },
     "spicetify": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-compat": "flake-compat_3",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1704167711,
-        "narHash": "sha256-kFDq+kf/Di/P8bq5sUP8pVwRkrSVrABksBjMPmLic3s=",
-        "owner": "the-argus",
+        "lastModified": 1721103144,
+        "narHash": "sha256-vHGUl/kagv0/QsPXMW+caSPyuvHvMUJSV80cbe+0/2M=",
+        "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "1325416f951d6a82cfddb1289864ad782e2b87c4",
+        "rev": "085ddf8abc78a7f1682c99715584e8735f4903cf",
         "type": "github"
       },
       "original": {
-        "owner": "the-argus",
+        "owner": "Gerg-L",
         "repo": "spicetify-nix",
         "type": "github"
       }
@@ -648,21 +646,6 @@
         "type": "github"
       }
     },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "walker": {
       "inputs": {
         "flake-parts": "flake-parts_5",
diff --git a/flake.nix b/flake.nix
index 8a3b5ae..40f5c58 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,7 +20,7 @@
 
     # Spotify + themes
     spicetify = {
-      url = "github:the-argus/spicetify-nix";
+      url = "github:Gerg-L/spicetify-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
diff --git a/home/programs/graphical/apps/spotify/default.nix b/home/programs/graphical/apps/spotify/default.nix
index 811b6fc..995455d 100644
--- a/home/programs/graphical/apps/spotify/default.nix
+++ b/home/programs/graphical/apps/spotify/default.nix
@@ -8,39 +8,52 @@
   inherit (lib) mkIf;
 
   cfg = osConfig.myOptions.home-manager.programs.applications.spotify;
-  spicePkgs = inputs.spicetify.packages.${pkgs.system}.default;
+  spicePkgs = inputs.spicetify.legacyPackages.${pkgs.system};
 in {
-  imports = [inputs.spicetify.homeManagerModule];
+  imports = [inputs.spicetify.homeManagerModules.default];
   config = mkIf cfg.enable {
     programs.spicetify = {
       enable = true;
-      injectCss = true;
-      replaceColors = true;
-
-      overwriteAssets = true;
-      sidebarConfig = true;
-      enabledCustomApps = with spicePkgs.apps; [
-        lyrics-plus
-        new-releases
-      ];
 
       theme = spicePkgs.themes.catppuccin;
       colorScheme = "mocha";
 
+      enabledCustomApps = with spicePkgs.apps; [
+        # Official apps
+        lyricsPlus
+        newReleases
+
+        # Community apps
+        ncsVisualizer
+        historyInSidebar
+      ];
+
       enabledExtensions = with spicePkgs.extensions; [
-        #adblock # I currently have premium
-        volumePercentage
-        fullAppDisplay
-        shuffle
-        hidePodcasts
-        playlistIcons
-        lastfm
-        historyShortcut
+        # Official extensions
         bookmark
-        fullAlbumDate
-        groupSession
+        fullAppDisplay
+        loopyLoop
         popupLyrics
-        # TODO: genre, see: https://github.com/the-argus/spicetify-nix/issues/50
+        shuffle
+        trashbin
+
+        # Community extensions
+        groupSession
+        skipOrPlayLikedSongs
+        fullAlbumDate
+        goToSong
+        listPlaylistsWithSong
+        wikify
+        songStats
+        showQueueDuration
+        history
+        betterGenres
+        #hidePodcasts
+        #adblock # I currently have premium
+        playNext
+        volumePercentage
+        copyLyrics
+        playingSource
       ];
     };
   };
diff --git a/hosts/voyager/default.nix b/hosts/voyager/default.nix
index 8862612..0999736 100644
--- a/hosts/voyager/default.nix
+++ b/hosts/voyager/default.nix
@@ -196,7 +196,7 @@
           hyfetch.enable = true;
         };
         applications = {
-          #spotify.enable = true; # https://github.com/the-argus/spicetify-nix/issues/62
+          spotify.enable = true;
           stremio.enable = true;
           vesktop = {
             enable = true;