diff --git a/bin/i3-companion b/bin/i3-companion index ca40274..b9590dd 100755 --- a/bin/i3-companion +++ b/bin/i3-companion @@ -48,6 +48,7 @@ application_icons = { "chromium": icon(3, ""), "d-feet": icon(2, ""), "darktable": icon(2, ""), + "deezer": icon(3, ""), "discord": icon(3, ""), "draw.io": icon(2, ""), "easyeffects": icon(2, ""), diff --git a/bin/rofi-mediaplayer b/bin/rofi-mediaplayer index a13bbe6..5bab4ed 100755 --- a/bin/rofi-mediaplayer +++ b/bin/rofi-mediaplayer @@ -45,7 +45,7 @@ media-playback-stop Stop go-next Next track audio-input-microphone Toggle microphone multimedia-volume-control Open mixer panel -com.spotify.Client Open Spotify +dev.aunetx.deezer Open Deezer EOF # Player status @@ -68,7 +68,7 @@ EOF 5) $playerctl next ;; 6) ~/.config/i3/bin/toggle-mute source ;; 7) i3-msg '[class="Pavucontrol"] focus' || i3-msg exec exec pavucontrol ;; - 8) i3-msg '[class="Spotify"] focus' || i3-msg exec exec spotify ;; + 8) i3-msg '[class="Deezer"] focus' || i3-msg exec exec dev.aunetx.deezer ;; esac >&2 ;; esac diff --git a/bin/spotify-clean b/bin/spotify-clean deleted file mode 100755 index dd8dae3..0000000 --- a/bin/spotify-clean +++ /dev/null @@ -1,9 +0,0 @@ -#!/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 diff --git a/config b/config index 370a88f..e95fdc7 100644 --- a/config +++ b/config @@ -6,7 +6,7 @@ set $down k set $left j set $right semicolon set $term vbeterm -set $mediaplayer spotify +set $mediaplayer MellowPlayer3 set $borderpx 3 font pango:Iosevka Aile 9 diff --git a/dotfiles/systemd/spotify-clean.service b/dotfiles/systemd/spotify-clean.service deleted file mode 100644 index 3214b32..0000000 --- a/dotfiles/systemd/spotify-clean.service +++ /dev/null @@ -1,9 +0,0 @@ -[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 diff --git a/dotfiles/systemd/spotify-clean.timer b/dotfiles/systemd/spotify-clean.timer deleted file mode 100644 index 2bd5c80..0000000 --- a/dotfiles/systemd/spotify-clean.timer +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Timer for cleaning spotify extra PA streams -After=pulseaudio.socket - -[Timer] -OnUnitActiveSec=1h -OnStartupSec=1h diff --git a/dotfiles/systemd/xsession.target b/dotfiles/systemd/xsession.target index dee8f2a..61e1594 100644 --- a/dotfiles/systemd/xsession.target +++ b/dotfiles/systemd/xsession.target @@ -8,7 +8,6 @@ Wants=picom.service Wants=pipewire-pulse.socket Wants=policykit-agent.service Wants=redshift.service -Wants=spotify-clean.timer Wants=ssh-agent.service Wants=weather.timer Wants=wireplumber.service