Spotify has been banished, never to be seen again

README.md

@@ -39,8 +39,6 @@ Ritual/Tears:
   - Telegram Desktop
   - Geary
   - Obsidian
-  - Spicetify
-    - Copy plugins/themes/patches
 
 ### Rsyncd Modules
 Modded minecraft instance rsync modules can be accessed through `mc-[modpack]@bloodletting::mc-[modpack]` with `--rsh=ssh`
@@ -49,7 +47,3 @@ Modded minecraft instance rsync modules can be accessed through `mc-[modpack]@bl
 ```sh
 cd common/pkgs/mastodon && ./update.sh --owner AgathaSorceress --rev <commit hash>
 ```
-
-## Reference configs used
-  - https://github.com/Xe/nixos-configs
-  - https://git.nora.codes/nora/nixconfig

common/fragments/graphical/bspwm.nix

@@ -15,7 +15,7 @@
           "element-desktop"
           "dino"
           "telegram-desktop"
-          "spotify"
+          "cider"
           "geary"
           "bspm -d"
         ];

common/fragments/graphical/default.nix

@@ -13,7 +13,6 @@
     ./picom.nix
     ./polybar.nix
     ./rofi.nix
-    ./spotify.nix
     ./syncthing.nix
     ./theme.nix
     ./url-eater.nix
@@ -23,8 +22,8 @@
     (final: prev: {
       pads = final.callPackage ../../../common/pkgs/pads.nix { };
       bspm = final.callPackage ../../../common/pkgs/bspm.nix { };
-      polybar-spotify =
+      polybar-scripts =
-        final.callPackage ../../../common/pkgs/polybar-spotify.nix { };
+        final.callPackage ../../../common/pkgs/polybar-scripts.nix { };
     })
   ];
 
@@ -35,6 +34,7 @@
     brightnessctl
     broot
     bspm
+    cider
     colmena
     darktable
     dino
@@ -64,7 +64,7 @@
     obs-studio
     obsidian
     pfetch
-    polybar-spotify
+    polybar-scripts
     pridefetch
     prismlauncher
     rink

common/fragments/graphical/polybar.nix

@@ -78,7 +78,7 @@
           modules = {
             left = "bspwm";
             center = "date";
-            right = "spotify wireguard notification-status";
+            right = "mpris wireguard notification-status";
           };
 
           wm-restack = "bspwm";
@@ -326,15 +326,13 @@
           format-prefix = " ";
         };
 
-        "module/spotify" = {
+        "module/mpris" = {
           type = "custom/script";
-          interval = 1;
+          tail = true;
           exec =
-            "${pkgs.polybar-spotify}/bin/polybar-spotify -f '{artist}: {song}'";
+            "${pkgs.polybar-scripts}/bin/player-mpris-tail/player-mpris-tail.py -f ' {artist}: {:t64:{title}:}' -w mpv -w cider";
-          format-prefix = " ";
-          format = "<label>";
           click-left =
-            "${pkgs.playerctl}/bin/playerctl --player=spotify play-pause";
+            "${pkgs.playerctl}/bin/playerctl --player=cider play-pause";
         };
       };
     };

common/fragments/graphical/spotify.nix

@@ -1,9 +0,0 @@
-{ pkgs, ... }: {
-  programs.spicetify = with pkgs.spicetify-pkgs; {
-    enable = true;
-    spicetifyPackage = pkgs.unstable.spicetify-cli;
-
-    enabledExtensions = with extensions; [ shuffle ];
-    enabledCustomApps = with apps; [ marketplace lyrics-plus ];
-  };
-}

common/pkgs/polybar-scripts.nix

@@ -0,0 +1,26 @@
+{ pkgs }:
+pkgs.stdenv.mkDerivation rec {
+  pname = "polybar-scripts";
+  version = "8a6a2c7fc6beb281515f81ccf5b9fafc830a3230";
+
+  src = pkgs.fetchFromGitHub {
+    owner = "polybar";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-4f12SSidJGElPbHs94WyoKj9kJH4dWsZSqMGOyzSJII=";
+  };
+
+  nativeBuildInputs = with pkgs; [ gobject-introspection wrapGAppsHook3 ];
+
+  propagatedBuildInputs = with pkgs; [
+    (python39.withPackages (pyPkgs: with pyPkgs; [ dbus-python pygobject3 ]))
+    glib
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    find . -type f ! -name "*.py" ! -name "*.sh" -exec rm {} \;
+    cp -r polybar-scripts/* $out/bin/
+    chmod -R +x $out/bin
+  '';
+}

common/pkgs/polybar-spotify.nix

@@ -1,19 +0,0 @@
-{ pkgs }:
-pkgs.stdenv.mkDerivation rec {
-  pname = "polybar-spotify";
-  version = "5edc2e598cf0ec5c54860c28db870af998271666";
-
-  src = pkgs.fetchFromGitHub {
-    owner = "Jvanrhijn";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-JPoigtxBYnFqi+8erhTcJlGN53VtS6z9mqNajQM0Xsk=";
-  };
-
-  propagatedBuildInputs = [
-    (pkgs.python39.withPackages (pyPkgs: [ pyPkgs.dbus-python ]))
-    pkgs.playerctl
-  ];
-
-  installPhase = "install -Dm755 ./spotify_status.py $out/bin/polybar-spotify";
-}

flake.nix

@@ -41,11 +41,6 @@
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
 
-    spicetify-nix = {
-      url = "github:the-argus/spicetify-nix";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
-    };
-
     helix = {
       url = "github:helix-editor/helix";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
@@ -57,8 +52,8 @@
     };
   };
   outputs = { nixpkgs, nixpkgs-unstable, home-manager, mms, helix, url-eater
-    , colorpickle, matrix-ril100, frq-friend, colmena, vampysite, spicetify-nix
+    , colorpickle, matrix-ril100, frq-friend, colmena, vampysite, ccase, ...
-    , ccase, ... }: {
+    }: {
       colmena = let
         mkDesktop = hostname: {
           imports = [
@@ -68,7 +63,6 @@
             (import "${home-manager}/nixos")
             url-eater.nixosModules.default
             colorpickle.nixosModules.default
-            spicetify-nix.nixosModule
           ];
 
           deployment = {
@@ -112,7 +106,6 @@
                 colorpickle = colorpickle.packages.${final.system}.default;
                 frq-friend = frq-friend.packages.${final.system}.default;
                 vampysite = vampysite.packages.${final.system}.default;
-                spicetify-pkgs = spicetify-nix.packages.${final.system}.default;
                 matrix-ril100 = matrix-ril100.packages.${final.system}.default;
                 ccase = ccase.packages.${final.system}.default;
 

hosts/ritual/configuration.nix

@@ -40,7 +40,7 @@
         "Element".desktop = "II";
         "TelegramDesktop".desktop = "III";
         "dino".desktop = "III";
-        "Spotify".desktop = "IV";
+        "Cider".desktop = "IV";
         "Geary".desktop = "V";
         "firefox" = {
           desktop = "I";

hosts/tears/configuration.nix

@@ -42,7 +42,7 @@
         "Element".desktop = "I";
         "TelegramDesktop".desktop = "II";
         "dino".desktop = "II";
-        "Spotify".desktop = "III";
+        "Cider".desktop = "III";
         "Geary".desktop = "IV";
         "firefox" = {
           desktop = "VI";