waybar: fix some warnings
This commit is contained in:
parent
90fa9564dc
commit
6b49c83fff
|
@ -2,13 +2,9 @@
|
||||||
|
|
||||||
PLAYERCTL="playerctl --ignore-player=mpd"
|
PLAYERCTL="playerctl --ignore-player=mpd"
|
||||||
|
|
||||||
STATUS="$(env LC_ALL=C $PLAYERCTL status title)"
|
test "$(LC_ALL=C $PLAYERCTL status)" = "Playing" \
|
||||||
TITLE="$($PLAYERCTL metadata title)"
|
&& printf " %s" "$($PLAYERCTL metadata title)" \
|
||||||
ARTIST="$($PLAYERCTL metadata artist)"
|
&& test -n "$($PLAYERCTL metadata artist)" \
|
||||||
|
&& printf " - %s" "$($PLAYERCTL metadata artist)"
|
||||||
test "$STATUS" = "Playing" \
|
|
||||||
&& printf " %s" "$TITLE" \
|
|
||||||
&& test -n "$ARTIST" \
|
|
||||||
&& printf " - %s" "$ARTIST"
|
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
|
|
|
@ -134,7 +134,7 @@ in
|
||||||
"custom/vpn" = lib.mkIf (osConfig.services.vpn.enable or false) {
|
"custom/vpn" = lib.mkIf (osConfig.services.vpn.enable or false) {
|
||||||
format = "{}";
|
format = "{}";
|
||||||
exec = ''
|
exec = ''
|
||||||
mullvad status | grep "^Connected" > /dev/null \
|
${pkgs.mullvad}/bin/mullvad status | ${pkgs.gnugrep}/bin/grep "^Connected" > /dev/null \
|
||||||
&& echo "" \
|
&& echo "" \
|
||||||
|| echo ""
|
|| echo ""
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Reference in a new issue