From 149d43f2bd5976e0bc886a8265a81ddf872575ad Mon Sep 17 00:00:00 2001
From: Blake Romero <blake@blkrom.com>
Date: Sat, 17 May 2025 22:03:13 +0100
Subject: Fix yambar newsboat tag & calendar/audio actions

---
 dot-config/yambar/config.yml            | 8 +++++---
 dot-config/yambar/scripts/newsboat      | 8 +++++---
 dot-config/yambar/scripts/newsboat-open | 4 ++++
 3 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100755 dot-config/yambar/scripts/newsboat-open

diff --git a/dot-config/yambar/config.yml b/dot-config/yambar/config.yml
index ac3fdec..329fda5 100644
--- a/dot-config/yambar/config.yml
+++ b/dot-config/yambar/config.yml
@@ -29,8 +29,8 @@ define:
 
   # Actions
   - &select-workspace "swaymsg workspace number {name}"
-  - &calendar footclient -T calendar pgrep calcurse || calcurse
-  - &audiomixer footclient -T audiomixer pgrep pulsemixer || pulsemixer
+  - &calendar footclient calcurse
+  - &audiomixer footclient pulsemixer
   - &network-control iwd-control.sh
   - &volume-up volume up 1%
   - &volume-down volume down 1%
@@ -38,6 +38,7 @@ define:
   - &brightness-down brightnessctl --min-value=10 set 1-%
   - &pacman-notify ~/.config/yambar/scripts/pacman-notify
   - &pacman-update ~/.config/yambar/scripts/pacman-update
+  - &newsboat-open ~/.config/yambar/scripts/newsboat-open
 
 # MODULES
 battery: &battery
@@ -168,6 +169,7 @@ pacman: &pacman
 # Newsboat
 newsboat: &newsboat
   path: ~/.config/yambar/scripts/newsboat
+  args: []
   poll-interval: 10000
   content:
     string:
@@ -175,7 +177,7 @@ newsboat: &newsboat
       foreground: *orange
       margin: *margin
       on-click:
-        left: "footclient -T 'newsboat' newsboat"
+        left: *newsboat-open
 
 mpd: &mpd
   host: /run/user/1000/mpd/socket
diff --git a/dot-config/yambar/scripts/newsboat b/dot-config/yambar/scripts/newsboat
index fa50b80..0dd97ec 100755
--- a/dot-config/yambar/scripts/newsboat
+++ b/dot-config/yambar/scripts/newsboat
@@ -1,8 +1,10 @@
 #!/bin/sh
 
 # Get unread count
-pgrep -x newsboat || newsboat -x print-unread >~/.cache/unread
+pgrep -x newsboat >/dev/null \
+	|| newsboat -x print-unread >~/.cache/unread
+
 unread=$(cut -f1 -d' ' ~/.cache/unread)
 
-# Display unread count
-printf "unread|int|%s\n\n" "$unread"
+# # Display unread count
+ printf "%s\n\n" "unread|int|$unread"
diff --git a/dot-config/yambar/scripts/newsboat-open b/dot-config/yambar/scripts/newsboat-open
new file mode 100755
index 0000000..b2ebf56
--- /dev/null
+++ b/dot-config/yambar/scripts/newsboat-open
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+footclient -T 'newsboat' newsboat
+newsboat -x print-unread > ~/.cache/unread
-- 
cgit