rope/nixos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

spotify: drop spotify_player for the normal client in the music scratchpad

Browse source
This commit is contained in:
rope 2026-08-19 17:52:39 +01:00
parent 9447413fa1
commit 8df52a3686
2 changed files with 16 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

47
settings/quickshell.nix
View file

@ -764,9 +764,8 @@ in
// Keybind cheat sheet — Super+C routes here via shell.qml's // Keybind cheat sheet — Super+C routes here via shell.qml's
// "cheatsheet" IpcHandler. The list is hand-maintained: the real // "cheatsheet" IpcHandler. The list is hand-maintained: the real
// binds live in settings/hyprland.nix's Lua config and the // binds live in settings/hyprland.nix's Lua config, so they need
// spotify-player ones are that app's built-in defaults, so both // updating here too when they change.
// need updating here too when they change.
Scope { Scope {
id: root id: root
property bool open: false property bool open: false
@ -775,7 +774,7 @@ in
{ title: "Apps", binds: [ { title: "Apps", binds: [
["Super + T", "Terminal"], ["Super + T", "Terminal"],
["Super + Return", "Scratchpad terminal"], ["Super + Return", "Scratchpad terminal"],
["Super + M", "Spotify Player"], ["Super + M", "Spotify"],
["Super + E", "Files"], ["Super + E", "Files"],
["Super + Z", "Zen browser"], ["Super + Z", "Zen browser"],
["Super + R", "Launcher"], ["Super + R", "Launcher"],
@ -806,22 +805,6 @@ in
["Super + Shift + S", "Screenshot region"], ["Super + Shift + S", "Screenshot region"],
["Print", "Screenshot screen"], ["Print", "Screenshot screen"],
]}, ]},
{ title: "Spotify Player", binds: [
["?", "Built-in help"],
["space", "Play / pause"],
["n / p", "Next / previous"],
["+ / -", "Volume"],
["< / >", "Seek"],
["D", "Switch device"],
["g s", "Search all of Spotify"],
["/", "Filter current page"],
["z", "Queue"],
["l", "Lyrics"],
["g l", "Library"],
["R", "Restart audio client"],
["tab", "Next pane"],
["q", "Quit"],
]},
] ]
PanelWindow { PanelWindow {
@ -6143,13 +6126,11 @@ in
}; };
add(player.identity); add(player.identity);
add(player.desktopEntry); add(player.desktopEntry);
// The bus name's last segment is the app's own token — // The bus name's last segment is the app's own token,
// spotify-player advertises identity "Spotify Player" // which often matches the Pipewire stream name when the
// but its Pipewire stream is "spotify_player", and the // display identity doesn't. Only the last segment:
// space/underscore mismatch defeats substring matching, // everything before it is the shared
// so the card never found its stream and the volume row // org.mpris.MediaPlayer2 prefix.
// stayed hidden. Only the last segment: everything
// before it is the shared org.mpris.MediaPlayer2 prefix.
add((player.dbusName || "").split(".").pop()); add((player.dbusName || "").split(".").pop());
let ns = Pipewire.nodes.values; let ns = Pipewire.nodes.values;
@ -6560,11 +6541,11 @@ in
// whole screen, so each of those // whole screen, so each of those
// commits makes Hyprland recomposite // commits makes Hyprland recomposite
// the entire output, which halved // the entire output, which halved
// framerates in games. Once // framerates in games. Spotify sits
// spotify-player became a daemon an // in the music scratchpad all
// MPRIS player is always present, so // session, so an MPRIS player is
// this card — and this animation — // always present and this card — and
// never went away. // this animation — never goes away.
// Stopped rather than paused: `paused` // Stopped rather than paused: `paused`
// on a non-running animation warns, // on a non-running animation warns,
// and the resume-at-current-angle it // and the resume-at-current-angle it
@ -7126,7 +7107,7 @@ in
visible: false visible: false
property var currentNotif: null property var currentNotif: null
property bool toastOpen: false property bool toastOpen: false
readonly property var mutedApps: ["discord", "Discord", "Vesktop", "vesktop", "Spotify", "spotify", "spotify_player", "spotify-player", "vlc", "mpv"] readonly property var mutedApps: ["discord", "Discord", "Vesktop", "vesktop", "Spotify", "spotify", "vlc", "mpv"]
readonly property bool isPrimary: bar.screen === Quickshell.screens[0] readonly property bool isPrimary: bar.screen === Quickshell.screens[0]
// Which frame band the toast lives against: the one the // Which frame band the toast lives against: the one the

4
settings/theming.nix
View file

@ -509,8 +509,8 @@ let
# No instance on the bus, or the action is gone. Restarting the daemon # No instance on the bus, or the action is gone. Restarting the daemon
# fixes it but takes every open terminal with it, so that is only on the # fixes it but takes every open terminal with it, so that is only on the
# table when there is nothing to lose. The class test has to cover the # table when there is nothing to lose. The class test has to cover the
# --class overrides from settings/hyprland.nix (dev.fred.scratchpad, # --class override from settings/hyprland.nix (dev.fred.scratchpad) —
# dev.fred.spotify) — those windows are the same process. # that window is the same process.
if ${pkgs.hyprland}/bin/hyprctl -j clients 2>/dev/null \ if ${pkgs.hyprland}/bin/hyprctl -j clients 2>/dev/null \
| ${pkgs.jq}/bin/jq -e 'any(.[].class; test("ghostty|^dev\\.fred\\."))' >/dev/null 2>&1; then | ${pkgs.jq}/bin/jq -e 'any(.[].class; test("ghostty|^dev\\.fred\\."))' >/dev/null 2>&1; then
echo "ghostty reload-config failed; open terminals keep the old theme" echo "ghostty reload-config failed; open terminals keep the old theme"