From 40de497a6ac2a2b92d08d0b67101bcc4f4d01bcc Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Wed, 21 Dec 2022 14:28:01 +0100
Subject: [PATCH] waybar: Implement stopgap measure for waybar mpd

---
 users/simon/modules/sway/waybar.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/users/simon/modules/sway/waybar.nix b/users/simon/modules/sway/waybar.nix
index 92bc873..cfb51fa 100644
--- a/users/simon/modules/sway/waybar.nix
+++ b/users/simon/modules/sway/waybar.nix
@@ -128,6 +128,9 @@ in
       interval = 2;
       tooltip-format = "MPD (connected)";
       tooltip-format-disconnected = "MPD (disconnected)";
+      # FIXME remove this once waybar fixes the regression (https://github.com/Alexays/Waybar/issues/1778)
+      on-click = "${pkgs.mpc_cli}/bin/mpc -q -h ${config.services.mpd.network.listenAddress} toggle";
+      on-click-right = "${pkgs.mpc_cli}/bin/mpc -q -h ${config.services.mpd.network.listenAddress} stop";
       on-scroll-up = "${pkgs.mpc_cli}/bin/mpc -q -h ${config.services.mpd.network.listenAddress} volume +2";
       on-scroll-down = "${pkgs.mpc_cli}/bin/mpc -q -h ${config.services.mpd.network.listenAddress} volume -2";
       title-len = 48;
@@ -307,8 +310,7 @@ in
     Service = {
       # ensure sway is already started, otherwise workspaces will not work
       ExecStartPre = "${config.wayland.windowManager.sway.package}/bin/swaymsg";
-      # FIXME: use new version (currently mpd widget does not toggle playback)
-      ExecStart = "${pkgs._2205.waybar}/bin/waybar";
+      ExecStart = "${pkgs.waybar}/bin/waybar";
       ExecReload = "${pkgs.utillinux}/bin/kill -SIGUSR2 $MAINPID";
       Restart = "on-failure";
       RestartSec = "1s";