From 8931455c6fa2e81966b1998fbdcc05c90e7fddc3 Mon Sep 17 00:00:00 2001
From: Jens Nolte <jens@nightmarestudio.de>
Date: Mon, 3 Feb 2020 02:28:16 +0100
Subject: [PATCH] Update blocks for new qbar exit code handling

---
 home-profiles/desktop/.config/qbar/blocks/todo |  9 ++++++---
 .../.config/qbar/blocks/volume-pulseaudio      |  8 ++++----
 .../desktop/.config/qbar/blocks/wifi2          | 18 +++++++-----------
 home-profiles/desktop/.config/sway/config      |  1 +
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/home-profiles/desktop/.config/qbar/blocks/todo b/home-profiles/desktop/.config/qbar/blocks/todo
index eb293d1..64dd14b 100755
--- a/home-profiles/desktop/.config/qbar/blocks/todo
+++ b/home-profiles/desktop/.config/qbar/blocks/todo
@@ -7,12 +7,15 @@ if (($TIME > 0100 && $TIME < 0800))
 then
 	if (($TIME > 0230))
 	then
-		echo "<span color='#000000' background='#ff2200'>$zzz sleep</span>"
+		echo "$zzz sleep"
+		exit 33
 	elif (($TIME > 0200))
 	then
-		echo "<span color='#ff4400'>$zzz sleep</span>"
+		echo "$zzz sleep"
+		exit 32
 	else
-		echo "<span color='#ff8800'>$zzz sleep</span>"
+		echo "$zzz sleep"
+		exit 31
 	fi
 
 	exit
diff --git a/home-profiles/desktop/.config/qbar/blocks/volume-pulseaudio b/home-profiles/desktop/.config/qbar/blocks/volume-pulseaudio
index 13cc47c..c82243d 100755
--- a/home-profiles/desktop/.config/qbar/blocks/volume-pulseaudio
+++ b/home-profiles/desktop/.config/qbar/blocks/volume-pulseaudio
@@ -113,11 +113,11 @@ function print_format {
     PERCENT="%"
     [[ $USE_PERCENT == 0 ]] && PERCENT=""
 
-    if [[ $MUTED =~ "no" ]]; then
-        BLOCK="$SYMBOL<span color='$ACTIVE_COLOR'>$VOL$PERCENT</span>"
-    else
+    # if [[ $MUTED =~ "no" ]]; then
+    #     BLOCK="$SYMBOL<span color='$ACTIVE_COLOR'>$VOL$PERCENT</span>"
+    # else
         BLOCK="$SYMBOL$VOL$PERCENT"
-    fi
+    # fi
 
     case "$1" in
         1) echo "$BLOCK [$NAME]" ;;
diff --git a/home-profiles/desktop/.config/qbar/blocks/wifi2 b/home-profiles/desktop/.config/qbar/blocks/wifi2
index 8637563..6ed09f5 100755
--- a/home-profiles/desktop/.config/qbar/blocks/wifi2
+++ b/home-profiles/desktop/.config/qbar/blocks/wifi2
@@ -15,19 +15,15 @@ SSID=$(iwgetid -r)
 
 QUALITY=$(grep $INTERFACE /proc/net/wireless | awk '{ print int($3 * 100 / 70) }')
 
+[[ "$SSID" = 100111010110 ]] && SSID="<span color='#44ccff'>$SSID</span>"
+
+echo "${SSID} $QUALITY%"
+
 # color
 if (( $QUALITY <= 20 )); then
-    QUALITY="<span color='#ff0000'>$QUALITY%</span>"
+    exit 29
 elif (( $QUALITY <= 30 )); then
-    QUALITY="<span color='#ffae00'>$QUALITY%</span>"
+    exit 28
 elif (( $QUALITY <= 40 )); then
-    QUALITY="<span color='#fff600'>$QUALITY%</span>"
-else
-    QUALITY="$QUALITY%"
+    exit 27
 fi
-
-# color-code specific ssids
-[[ "$SSID" = 100111010110 ]] && SSID="<span color='#44ccff'>$SSID</span>"
-
-echo "${SSID} $QUALITY" # full text
-echo "${SSID} $QUALITY" # short text
diff --git a/home-profiles/desktop/.config/sway/config b/home-profiles/desktop/.config/sway/config
index fdc2380..27ee5e5 100644
--- a/home-profiles/desktop/.config/sway/config
+++ b/home-profiles/desktop/.config/sway/config
@@ -62,6 +62,7 @@ output eDP-1 {
 output * bg $wallpaper fill
 
 # Run desktop daemons
+exec kanshi
 exec mako
 #exec CM_SELECTIONS=clipboard clipmenud
 #exec nm-applet --indicator
-- 
GitLab