Revert "music: replace Spotify by Deezer"

This reverts commit 7086a909cf.
This commit is contained in:
Vincent Bernat 2024-05-18 14:42:40 +02:00
parent ad72179d7a
commit 8235201167
7 changed files with 29 additions and 4 deletions

View file

@ -48,7 +48,6 @@ application_icons = {
"chromium": icon(3, ""), "chromium": icon(3, ""),
"d-feet": icon(2, ""), "d-feet": icon(2, ""),
"darktable": icon(2, ""), "darktable": icon(2, ""),
"deezer": icon(3, ""),
"discord": icon(3, ""), "discord": icon(3, ""),
"draw.io": icon(2, ""), "draw.io": icon(2, ""),
"easyeffects": icon(2, ""), "easyeffects": icon(2, ""),

View file

@ -45,7 +45,7 @@ media-playback-stop Stop
go-next Next track go-next Next track
audio-input-microphone Toggle microphone audio-input-microphone Toggle microphone
multimedia-volume-control Open mixer panel multimedia-volume-control Open mixer panel
dev.aunetx.deezer Open Deezer com.spotify.Client Open Spotify
EOF EOF
# Player status # Player status
@ -68,7 +68,7 @@ EOF
5) $playerctl next ;; 5) $playerctl next ;;
6) ~/.config/i3/bin/toggle-mute source ;; 6) ~/.config/i3/bin/toggle-mute source ;;
7) i3-msg '[class="Pavucontrol"] focus' || i3-msg exec exec pavucontrol ;; 7) i3-msg '[class="Pavucontrol"] focus' || i3-msg exec exec pavucontrol ;;
8) i3-msg '[class="Deezer"] focus' || i3-msg exec gtk-launch dev.aunetx.deezer ;; 8) i3-msg '[class="Spotify"] focus' || i3-msg exec gtk-launch com.spotify.Client ;;
esac >&2 esac >&2
;; ;;
esac esac

9
bin/spotify-clean Executable file
View file

@ -0,0 +1,9 @@
#!/bin/sh
# Kill all spotify streams, except the most recent one. We need to use
# the serial to know which one this is as ID are not monotonous.
pw-dump \
| jq '.[]|select(.type == "PipeWire:Interface:Client" and .info.props."application.name" == "spotify").id' \
| head -n-1 \
| xargs -trn1 pw-cli destroy

2
config
View file

@ -6,7 +6,7 @@ set $down k
set $left j set $left j
set $right semicolon set $right semicolon
set $term vbeterm set $term vbeterm
set $mediaplayer chromium.instance3 set $mediaplayer spotify
set $borderpx 3 set $borderpx 3
font pango:Iosevka Aile 9 font pango:Iosevka Aile 9

View file

@ -0,0 +1,9 @@
[Unit]
Description=Cleaner for Spotify extra PulseAudio streams
After=sound.target
[Service]
ExecStart=%h/.config/i3/bin/spotify-clean
Type=oneshot
RemainAfterExit=false
TimeoutStartSec=5s

View file

@ -0,0 +1,7 @@
[Unit]
Description=Timer for cleaning spotify extra PA streams
After=pulseaudio.socket
[Timer]
OnUnitActiveSec=1h
OnStartupSec=1h

View file

@ -8,6 +8,7 @@ Wants=picom.service
Wants=pipewire-pulse.socket Wants=pipewire-pulse.socket
Wants=policykit-agent.service Wants=policykit-agent.service
Wants=redshift.service Wants=redshift.service
Wants=spotify-clean.timer
Wants=ssh-agent.service Wants=ssh-agent.service
Wants=weather.timer Wants=weather.timer
Wants=wireplumber.service Wants=wireplumber.service