diff --git a/apps/gui/default.nix b/apps/gui/default.nix
index a370b445b5ec317c2c38f3bc4aadaaec835e2aa6..6436a1cec5c675a19bdb45e06c9519cca7aca858 100644
--- a/apps/gui/default.nix
+++ b/apps/gui/default.nix
@@ -4,7 +4,7 @@     ../nogui
     ./firefox.nix
     ./ghostty.nix
     ./gtk.nix
-    ./spotify.nix
+    ./spotifyd.nix
     ./tiny.nix
     ./wezterm.nix
   ];
@@ -15,7 +15,7 @@       cinny-desktop
       delve
       discord
       obsidian
-      spotify-player
+      spotify-tui
 
       # LSPs
       lua-language-server
diff --git a/apps/gui/spotify.nix b/apps/gui/spotify.nix
deleted file mode 100644
index c490ee9150b679b966cf03ef936133cc5ee22f98..0000000000000000000000000000000000000000
--- a/apps/gui/spotify.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{pkgs, ...}: {
-  xdg.configFile."spotify-player/theme.toml".text = builtins.readFile (pkgs.fetchFromGitHub {
-      owner = "catppuccin";
-      repo = "spotify-player";
-      rev = "816e48fe7ade959dab920d83a7a88a952c48ede3";
-      sha256 = "sha256-Xl8GoAzuSfYmFb5ohS4H5we9q+0DTrCwQ3WubPsnxGg=";
-    }
-    + "/src/theme.toml");
-  xdg.configFile."spotify-player/app.toml".source = (pkgs.formats.toml {}).generate "spotify-player-config" {
-    client_id = "41af4976ba70474fbd541ee8764a2cda";
-    theme = "Catppuccin-mocha";
-    enable_notify = false;
-    enable_media_control = true;
-    device.volume = 100;
-  };
-  programs.nushell.shellAliases.spt = "spotify_player";
-}
diff --git a/apps/gui/spotifyd.nix b/apps/gui/spotifyd.nix
new file mode 100644
index 0000000000000000000000000000000000000000..fc0c170a6969b0e7cd708f3695eadd0684dbb16b
--- /dev/null
+++ b/apps/gui/spotifyd.nix
@@ -0,0 +1,17 @@
+{pkgs, ...}: {
+  services.spotifyd = {
+    enable = true;
+    settings.global = {
+      username = "john.olheiser";
+      password_cmd = "cat /run/agenix/spotify-pw";
+      device_name = "nix";
+    };
+  };
+  xdg.configFile."spotify-tui/config.yml".text = builtins.readFile (pkgs.fetchFromGitHub {
+      owner = "catppuccin";
+      repo = "spotify-tui";
+      rev = "45a4ef12508784410c516746c9d84862d52e4567";
+      sha256 = "sha256-RXJ+skwUu2miCbBDLXx0Md0aVgo3iub2rQBzICwYLMU=";
+    }
+    + "/mocha.yml");
+}
diff --git a/flake.nix b/flake.nix
index a512769f75e6edcb846cc4f2831e9709f7ff9aa6..62559f4cf796471175c2662364a8067024cc8b8c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -131,12 +131,9 @@         };
         age.secrets = {
           ssh-config = userSecret ./secrets/shared/ssh-config.age;
           ssh-config-work = userSecret ./secrets/shared/ssh-config-work.age;
-      inputs.nixpkgs.follows = "nixpkgs";
+{
     nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2";
-            file = ./secrets/shared/spotify.age;
-            owner = username;
-            path = "/home/${username}/.cache/spotify-player/credentials.json";
-          };
+    nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2";
           irc-pw = userSecret ./secrets/shared/irc-pw.age;
           gist-pw = userSecret ./secrets/shared/gist-pw.age;
           git-send-email = userSecret ./secrets/shared/git-send-email.age;
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index cf1a436d847316c4bc53ad7a963ddcdc686e9fbe..26fe91c5217f9ea0a3a7f3d14c273ae835ff93ef 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -8,7 +8,7 @@   all = [jolheiser matcha chai dragonwell];
 in {
   "shared/ssh-config.age".publicKeys = all;
   "shared/ssh-config-work.age".publicKeys = all;
-  "shared/spotify.age".publicKeys = all;
+  "shared/spotify-pw.age".publicKeys = all;
   "shared/irc-pw.age".publicKeys = all;
   "shared/gist-pw.age".publicKeys = all;
   "shared/git-send-email.age".publicKeys = all;
diff --git a/secrets/shared/spotify-pw.age b/secrets/shared/spotify-pw.age
new file mode 100644
index 0000000000000000000000000000000000000000..ee2030561e6c73dea2f1974bfbb40424ec7dc20a
--- /dev/null
+++ b/secrets/shared/spotify-pw.age
@@ -0,0 +1,14 @@
+age-encryption.org/v1
+-> ssh-ed25519 E8j6/g rTczN49uC7rlcUspdrZvezwwsopZbDI3ed2Iu8dMqho
+5bYO3BkBUlfND31gZP9Q2mm36uG0H3ztKz53+ULWEpI
+-> ssh-ed25519 xUMv2w Afpo98rI2byTAp1ggl6dk1jLUX38/Kw0quZmkNYToBc
+uf2EAkbf++q3JJJmtvr/0GGXF36vKGi79P9nDcwnkOM
+-> ssh-ed25519 jo1MPA rtF3q41fH9J65yefk+HH8lbAnH8Uks+JqmKfKHNiBAM
+JljmFpYPY9UZrqj4bNMAuiIIpfGtts/BLdBBcECFluA
+-> ssh-ed25519 f31uNA be9QDOLTnswNPCzOwAzrkcjZnGi0bRkqKn6XVu9POGQ
++HI5hr4P5JpwvnYos4MWWfgNYbav96Dql6ByQ3FyOZw
+-> 2-grease +t`Yq +>J# MPH/!o 0M
+Y4t2zoE06phrwv7b85k716E9a/6rDrTMUzHG7FEEL1vf1l2HxDRmbETdD8vqgHyr
+a93dGwR316iAcBz36LBZ
+--- yBlcDPxXfHOlWH84kOPk90Y/QnyxAmmHEe3DON5+UbA
+��^������G1�3Q�? ��}�����q��amZ/�Fq���Y��5�I�
\ No newline at end of file
diff --git a/secrets/shared/spotify.age b/secrets/shared/spotify.age
deleted file mode 100644
index 1b760f021836e9cf922899c0cc05fd8bbee12f4c..0000000000000000000000000000000000000000
--- a/secrets/shared/spotify.age
+++ /dev/null
@@ -1,14 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 E8j6/g NP0qP5dxYB6KZ1Wa9a91XsT8jP5USL+Mv1qPBz5KBBA
-ryml/Fr+ue9vtdvpYQ5CcAZLYsxNq/0cg5Z0jxkS740
--> ssh-ed25519 xUMv2w 6qMMxiDjNPWyIjZBYu9ZITtg8yOLe8pdCEKqXRrZfVM
-oXE21t5+l7Hwqv0+yqomhilbAuVajufNzZ9py1v4GnY
--> ssh-ed25519 jo1MPA QKp2NFCDqg/wxewXLXob9fXpbASsiEwfvrUbYu3LMgg
-OulnC5T/VoEKdOSd+q9OsaMs3JBcJ8uHvp5zrstTt1g
--> ssh-ed25519 f31uNA U2VaJ3nLdoSV1LupL9EJeM9LLCc/8WLIHzZfHnXzdCM
-OvsNQEK7I9jKi1MarwYB/I91tOiGYu08W9fZ9xIw7MI
--> %k<I-grease
-0zyvlRvbVlfVJQV9yzrRzw92w7nckiMKbGe0Rzw1v6tG5KHGEjQo
---- KISMpNf5glwbzCOJbgO7mh7ixf2JLazBfaJCFB8Zr4E
-��C�K�v�ޞ�3Yߪ�&�yA�k{�6-�8��/u 
-���_�E�!ht9�a����L|x��{���i8��^��$Ӱ+UYr��Um�#6�"��n@7�pV��=�y�M���V;}	ax��_qV����E�GD4w��h����:C{w��T-K��Ȩ���*�&�"��ϣ�TNG��eC�6�|�|��8�q�#��hM߾Vî
�o�C8�wsy���I���B
>�C��xB-U�w^�V�/�A��"�B�ی�-3=9�"���7�5�@*�\�B
\ No newline at end of file