From e92b02f1fbff5ea8b38cd96b1f1824d9902ffc26 Mon Sep 17 00:00:00 2001
From: Jens Nolte <jens@nightmarestudio.de>
Date: Mon, 2 Mar 2020 22:49:24 +0100
Subject: [PATCH] Update blocks for new qbar version

---
 home-profiles/desktop/.config/qbar/blocks/todo         |  9 +++------
 .../desktop/.config/qbar/blocks/volume-pulseaudio      | 10 ++++------
 home-profiles/desktop/.config/sway/config              |  5 +----
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/home-profiles/desktop/.config/qbar/blocks/todo b/home-profiles/desktop/.config/qbar/blocks/todo
index 64dd14b..ff45fc5 100755
--- a/home-profiles/desktop/.config/qbar/blocks/todo
+++ b/home-profiles/desktop/.config/qbar/blocks/todo
@@ -7,15 +7,12 @@ if (($TIME > 0100 && $TIME < 0800))
 then
 	if (($TIME > 0230))
 	then
-		echo "$zzz sleep"
-		exit 33
+		echo "<active><critical>$zzz sleep</critical></active>"
 	elif (($TIME > 0200))
 	then
-		echo "$zzz sleep"
-		exit 32
+		echo "<active><error>$zzz sleep</error></active>"
 	else
-		echo "$zzz sleep"
-		exit 31
+		echo "<active><warning>$zzz sleep</warning></active>"
 	fi
 
 	exit
diff --git a/home-profiles/desktop/.config/qbar/blocks/volume-pulseaudio b/home-profiles/desktop/.config/qbar/blocks/volume-pulseaudio
index c82243d..8db5560 100755
--- a/home-profiles/desktop/.config/qbar/blocks/volume-pulseaudio
+++ b/home-profiles/desktop/.config/qbar/blocks/volume-pulseaudio
@@ -13,8 +13,6 @@ AUDIO_MUTED_SYMBOL=$'🔇\uFE0E '
 
 AUDIO_INTERVAL=5
 
-ACTIVE_COLOR="#ffffff"
-
 LONG_FORMAT=4
 SHORT_FORMAT=2
 USE_PERCENT=1
@@ -113,11 +111,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="<active>$SYMBOL$VOL$PERCENT</active>"
+    else
         BLOCK="$SYMBOL$VOL$PERCENT"
-    # fi
+    fi
 
     case "$1" in
         1) echo "$BLOCK [$NAME]" ;;
diff --git a/home-profiles/desktop/.config/sway/config b/home-profiles/desktop/.config/sway/config
index b490037..4b28052 100644
--- a/home-profiles/desktop/.config/sway/config
+++ b/home-profiles/desktop/.config/sway/config
@@ -401,11 +401,8 @@ client.urgent           $base00 $base0A $base00 $base09 $base09
 client.placeholder      $base00 $base00 $base05 $base00 $base00
 client.background       $base00
 
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
 bar {
-	status_command qbar server swaybar
-#	status_command SCRIPT_DIR=~/run/blocks i3blocks
+	status_command qbar server swaybar legacy
 	id bar-0
 	position top
 	strip_workspace_numbers yes
-- 
GitLab