diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 81941829..4ac0b805 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -187,6 +187,11 @@ in ''
   bind = SUPER SHIFT, E, movetoworkspace, name:emacs
   bind = SUPER ALT, E, exec, [workspace name:emacs] emacs
 
+  bind = SUPER, A, moveworkspacetomonitor, name:spotify current
+  bind = SUPER, A, workspace, name:spotify
+  bind = SUPER SHIFT, A, movetoworkspace, name:spotify
+  bind = SUPER ALT, A, exec, [workspace name:spotify] alacritty -e ncspot
+
   bind = SUPER, T, moveworkspacetomonitor, name:top current
   bind = SUPER, T, workspace, name:top
   bind = SUPER SHIFT, T, movetoworkspace, name:top
diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix
index 80428d33..29a6d887 100644
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@@ -38,6 +38,7 @@
           "6" = "󰫈";
           "emacs" = "";
           "top" = "󰒋";
+          "spotify" = "󰓇";
           "chromium" = "";
           "discord" = "󰙯";
           "steam" = "󰓓";
@@ -51,10 +52,12 @@
       };
       "hyprland/window" = {
         rewrite = {
-          "(.*) - GNU Emacs(.*)" = "󰅴 $1";
-          "btop" = " System monitoring";
-          "(.*) - Chromium" = "󰖟 $1";
+          "(.*) - GNU Emacs(.*)" = " $1";
+          "btop" = " System Status";
+          "ncspot" = "󰓇 Spotify TUI";
+          "(.*) - Chromium" = " $1";
           "Nyxt - (.*)" = "󰖟 $1";
+          "(.*) - Discord" = "󰙯 $1";
           "NoMachine - (.*)" = "󰢹 $1";
         };
         separate-outputs = true;