diff options
| author |  sommerfeld <sommerfeld@sommerfeld.dev> | 2026-05-13 13:43:20 +0100 |
|---|---|---|
| committer | sommerfeld <sommerfeld@sommerfeld.dev> | 2026-05-13 13:43:20 +0100 |
| commit | 570a8973d8594db9a72cb93a1e2c2350368051d0 (patch) | |
| tree | 405ee63506f86a2f134bbc1a0aa884fb2e0d8ba9 | |
| parent | 849bb43a7e6789867f5ca6ec68b76042051e532c (diff) | |
| download | dotfiles-570a8973d8594db9a72cb93a1e2c2350368051d0.tar.gz dotfiles-570a8973d8594db9a72cb93a1e2c2350368051d0.tar.bz2 dotfiles-570a8973d8594db9a72cb93a1e2c2350368051d0.zip | |
fix(waybar): use makoctl --format for text output, not JSON grep
makoctl outputs plain text by default on this version. Use --format
strings for both the history picker (%a/%s/%b) and the counter script
(%i + wc), instead of trying to parse JSON that isn't there.
| -rwxr-xr-x | dot_config/waybar/executable_mako-history.sh | 8 | ||||
| -rw-r--r-- | dot_config/waybar/executable_mako-status.sh | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/dot_config/waybar/executable_mako-history.sh b/dot_config/waybar/executable_mako-history.sh index 4c0ec3a..0617ca0 100755 --- a/dot_config/waybar/executable_mako-history.sh +++ b/dot_config/waybar/executable_mako-history.sh @@ -7,12 +7,8 @@ set -eu selection=$( - makoctl history | jq -r ' - def v: if type == "object" and has("data") then .data else . end; - [.. | objects | select(has("summary") and has("app-name"))] - | .[] - | "[\(.["app-name"] | v)] \(.summary | v) — \((.body | v) // "")" - ' | fuzzel --dmenu --prompt 'History: ' + makoctl history --format '[%a] %s — %b' | + fuzzel --dmenu --prompt 'History: ' ) if [ -n "$selection" ]; then diff --git a/dot_config/waybar/executable_mako-status.sh b/dot_config/waybar/executable_mako-status.sh index 3c50172..c97f9f8 100644 --- a/dot_config/waybar/executable_mako-status.sh +++ b/dot_config/waybar/executable_mako-status.sh @@ -8,10 +8,8 @@ if ! command -v makoctl >/dev/null 2>&1; then exit 0 fi -count=$(makoctl history 2>/dev/null | - grep -c '"summary"' || true) -pending=$(makoctl list 2>/dev/null | - grep -c '"summary"' || true) +count=$(makoctl history --format '%i' 2>/dev/null | grep -c . || true) +pending=$(makoctl list --format '%i' 2>/dev/null | grep -c . || true) if [ "$pending" -gt 0 ]; then text="NTF !$pending" |