From 27f6ecdb0953c899a3a270f79f21353d397b5695 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Mon, 27 Dec 2021 10:01:29 +0100 Subject: [PATCH] Revert "systemd: switch back to PulseAudio" This reverts commit cda8ef9831bb11dca92534c89f5b181c7568a9c8. --- bin/i3-companion | 1 + bin/rofi-mediaplayer | 7 +++++-- dotfiles/systemd/easyeffects.service | 11 +++++++++++ dotfiles/systemd/spotify-clean.timer | 2 +- dotfiles/systemd/xsession.target | 3 ++- 5 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 dotfiles/systemd/easyeffects.service diff --git a/bin/i3-companion b/bin/i3-companion index 5d87143..f164562 100755 --- a/bin/i3-companion +++ b/bin/i3-companion @@ -45,6 +45,7 @@ application_icons = { "darktable": icon(2, ""), "discord": icon(3, ""), "draw.io": icon(2, ""), + "easyeffects": icon(2, ""), "emacs": icon(2, ""), "file-roller": icon(2, ""), "firefox": icon(3, ""), diff --git a/bin/rofi-mediaplayer b/bin/rofi-mediaplayer index 3725248..efe2c0d 100755 --- a/bin/rofi-mediaplayer +++ b/bin/rofi-mediaplayer @@ -12,7 +12,8 @@ if [ -z "${ROFI_OUTSIDE}" ]; then -kb-select-4 Super+v \ -kb-select-5 Super+b \ -kb-select-6 Super+m \ - -kb-select-7 Super+s + -kb-select-7 Super+e \ + -kb-select-8 Super+s fi case $ROFI_RETV in @@ -34,6 +35,7 @@ media-playback-pause Pause media-playback-stop Stop go-next Next track multimedia-volume-control Open mixer panel +easyeffects Open effects panel media-tape Open ${Mediaplayer} EOF @@ -56,7 +58,8 @@ EOF 4) playerctl -p $mediaplayer stop ;; 5) playerctl -p $mediaplayer next ;; 6) i3-msg '[class="Pavucontrol"] focus' || i3-msg exec exec pavucontrol ;; - 7) i3-msg '[class="'${Mediaplayer}'"] focus' || i3-msg exec exec ${mediaplayer} ;; + 7) i3-msg '[class="easyeffects"] focus' || i3-msg exec exec easyeffects ;; + 8) i3-msg '[class="'${Mediaplayer}'"] focus' || i3-msg exec exec ${mediaplayer} ;; esac >&2 ;; esac diff --git a/dotfiles/systemd/easyeffects.service b/dotfiles/systemd/easyeffects.service new file mode 100644 index 0000000..f731a0e --- /dev/null +++ b/dotfiles/systemd/easyeffects.service @@ -0,0 +1,11 @@ +[Unit] +Description=Easyeffects for Pipewire +PartOf=graphical-session.target + +[Service] +Type=dbus +BusName=com.github.wwmm.easyeffects +ExecStart=%h/.nix-profile/bin/easyeffects --gapplication-service +ExecStartPost=-%h/.nix-profile/bin/easyeffects -l default-input +ExecStartPost=-%h/.nix-profile/bin/easyeffects -l default-output +Restart=on-failure diff --git a/dotfiles/systemd/spotify-clean.timer b/dotfiles/systemd/spotify-clean.timer index 2bd5c80..627e6f3 100644 --- a/dotfiles/systemd/spotify-clean.timer +++ b/dotfiles/systemd/spotify-clean.timer @@ -1,6 +1,6 @@ [Unit] Description=Timer for cleaning spotify extra PA streams -After=pulseaudio.socket +After=pipewire-pulse.socket [Timer] OnUnitActiveSec=1h diff --git a/dotfiles/systemd/xsession.target b/dotfiles/systemd/xsession.target index fd198d5..25dbdab 100644 --- a/dotfiles/systemd/xsession.target +++ b/dotfiles/systemd/xsession.target @@ -3,10 +3,11 @@ Description=X session BindsTo=graphical-session.target Wants=autorandr.service Wants=dunst.socket +Wants=easyeffects.service Wants=inputplug.service Wants=picom.service +Wants=pipewire-pulse.socket Wants=policykit-agent.service -Wants=pulseaudio.socket Wants=redshift.service Wants=spotify-clean.timer Wants=ssh-agent.service