diff --git a/scripts/playerctl-status b/scripts/playerctl-status index 754fe5a..76b2262 100644 --- a/scripts/playerctl-status +++ b/scripts/playerctl-status @@ -2,13 +2,9 @@ PLAYERCTL="playerctl --ignore-player=mpd" -STATUS="$(env LC_ALL=C $PLAYERCTL status title)" -TITLE="$($PLAYERCTL metadata title)" -ARTIST="$($PLAYERCTL metadata artist)" - -test "$STATUS" = "Playing" \ -&& printf " %s" "$TITLE" \ -&& test -n "$ARTIST" \ -&& printf " - %s" "$ARTIST" +test "$(LC_ALL=C $PLAYERCTL status)" = "Playing" \ +&& printf " %s" "$($PLAYERCTL metadata title)" \ +&& test -n "$($PLAYERCTL metadata artist)" \ +&& printf " - %s" "$($PLAYERCTL metadata artist)" echo "" diff --git a/user/waybar/default.nix b/user/waybar/default.nix index a0e2db1..2e30b11 100644 --- a/user/waybar/default.nix +++ b/user/waybar/default.nix @@ -134,7 +134,7 @@ in "custom/vpn" = lib.mkIf (osConfig.services.vpn.enable or false) { format = "{}"; exec = '' - mullvad status | grep "^Connected" > /dev/null \ + ${pkgs.mullvad}/bin/mullvad status | ${pkgs.gnugrep}/bin/grep "^Connected" > /dev/null \ && echo "" \ || echo "" '';