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.

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"