From 9625fd3962a87cee73fd788472f18a683d0c3401 Mon Sep 17 00:00:00 2001
From: LavaDesu <me@lava.moe>
Date: Thu, 22 Jun 2023 23:34:14 +0700
Subject: [PATCH] user/spicetify: fixes

---
 flake.lock                 | 17 +++++++++++++++++
 flake.nix                  |  1 +
 modules/user/spicetify.nix |  9 ++++-----
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9ad4f74..69bc217 100644
--- a/flake.lock
+++ b/flake.lock
@@ -681,6 +681,7 @@
         "pure": "pure",
         "rust-overlay": "rust-overlay",
         "spicetify-nix": "spicetify-nix",
+        "spicetify-themes": "spicetify-themes",
         "spotify-adblock": "spotify-adblock",
         "tree-sitter-glimmer": "tree-sitter-glimmer",
         "tree-sitter-jsonc": "tree-sitter-jsonc",
@@ -732,6 +733,22 @@
         "type": "github"
       }
     },
+    "spicetify-themes": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1687406074,
+        "narHash": "sha256-DPn54R0uRjmi6gl9Dfh7Hx1w2pDprltQJJp222esK3M=",
+        "owner": "spicetify",
+        "repo": "spicetify-themes",
+        "rev": "fba1a2971b8fd0cfa859e5901a724abbdd778e5b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "spicetify",
+        "repo": "spicetify-themes",
+        "type": "github"
+      }
+    },
     "spotify-adblock": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index 634a949..8a11c63 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,6 +22,7 @@
     # services
     hosts-blocklists = { url = "github:notracking/hosts-blocklists"; flake = false; };
     website = { url = "github:LavaDesu/lavadesu.github.io/master"; flake = false; };
+    spicetify-themes = { url = "github:spicetify/spicetify-themes"; flake = false; };
 
     # zsh plugins
     zsh-abbr = { url = "github:olets/zsh-abbr"; flake = false; };
diff --git a/modules/user/spicetify.nix b/modules/user/spicetify.nix
index 8466e1e..8158246 100644
--- a/modules/user/spicetify.nix
+++ b/modules/user/spicetify.nix
@@ -17,7 +17,9 @@ in
 
     enable = true;
     theme = spicePkgs.themes.Dribbblish // {
-      requiredExtensions = [((builtins.head spicePkgs.themes.Dribbblish.requiredExtensions) // { filename = "theme.js"; }) ];
+      #src = inputs.spicetify-themes;
+      extraCommands = "spicetify-cli --no-restart config experimental_features 1";
+      #requiredExtensions = [((builtins.head spicePkgs.themes.Dribbblish.requiredExtensions) // { filename = "theme.js"; }) ];
     };
     colorScheme = "purple";
 
@@ -25,17 +27,14 @@ in
       lyrics-plus
     ];
     enabledExtensions = with spicePkgs.extensions; [
-      fullAppDisplay
+      fullAppDisplayMod
       shuffle # shuffle+ (special characters are sanitized out of ext names)
       hidePodcasts
 
-      fullAppDisplayMod
       skipStats
       songStats
       history
-      hidePodcasts
       volumePercentage
     ];
   };
-
 }