From 397f10b8d29d451a11fab51a7a4a72da06967d1c Mon Sep 17 00:00:00 2001
From: David JULIEN <swy7ch@protonmail.com>
Date: Tue, 16 Feb 2021 20:53:50 +0100
Subject: [PATCH] feat: put spaces in statusbar modules

---
 .local/bin/statusbar/sb-battery  | 5 +++--
 .local/bin/statusbar/sb-internet | 4 ++--
 .local/bin/statusbar/sb-mailbox  | 2 +-
 .local/bin/statusbar/sb-music    | 5 +++--
 .local/bin/statusbar/sb-volume   | 4 ++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.local/bin/statusbar/sb-battery b/.local/bin/statusbar/sb-battery
index 6b8f72e..58652d8 100755
--- a/.local/bin/statusbar/sb-battery
+++ b/.local/bin/statusbar/sb-battery
@@ -27,7 +27,8 @@ do
 	status="$(cat "$bat/status")"
 	capacity="$(cat "$bat/capacity")"
 	if [ "$status" = "Full" ]; then
-		printf "  FULL" && exit
+		status=" " && capacity="FULL"
+		printf " %s %s " "$status" "$capacity" && exit
  	elif [ "$status" = "Charging" ]; then
 		status=""
 	else
@@ -39,5 +40,5 @@ do
 			*)	status="" ; notify;;
 		esac
 	fi
-	printf "%s %3d%%\n" "$status" "$capacity";
+	printf " %s %3d%% " "$status" "$capacity";
 done && return 0
diff --git a/.local/bin/statusbar/sb-internet b/.local/bin/statusbar/sb-internet
index 5590b96..7fe6d4a 100755
--- a/.local/bin/statusbar/sb-internet
+++ b/.local/bin/statusbar/sb-internet
@@ -12,9 +12,9 @@
 
 # Wifi quality percentage and  icon if ethernet is connected.
 wifi="$(grep "^\s*w" /proc/net/wireless | awk '{ printf int($3 * 100 / 70) }')"
-[ $wifi -ne 0 ] && printf "直 %3d%%" $wifi || printf "睊  ---"
+[ $wifi -ne 0 ] && printf " 直 %3d%% " $wifi || printf " 睊  --- "
 eth="$(cat /sys/class/net/enp0s25/operstate)"
 if [ "up" = "$eth" ]; then
-	printf " / "
+	printf " /  "
 fi
 
diff --git a/.local/bin/statusbar/sb-mailbox b/.local/bin/statusbar/sb-mailbox
index 978d775..73ae025 100755
--- a/.local/bin/statusbar/sb-mailbox
+++ b/.local/bin/statusbar/sb-mailbox
@@ -22,4 +22,4 @@ do
 done
 [ -n "$unread" ] && unread="($(echo "$unread" | cut -c 2-))" || exit
 
-printf " %s%s" "$unread" "$icon"
+printf "  %s%s " "$unread" "$icon"
diff --git a/.local/bin/statusbar/sb-music b/.local/bin/statusbar/sb-music
index b50e34c..be65499 100755
--- a/.local/bin/statusbar/sb-music
+++ b/.local/bin/statusbar/sb-music
@@ -11,8 +11,9 @@
 
 
 mpc="$(mpc --format "%albumartist% - %title%")"
-format() { tac | sed "s/^volume: n\/a.*/ 🎵 ---/g;/^volume:/d;s/\\&/&amp;/g;s/\\[paused\\].*/ ⏸/g;s/\\[playing\\].*/ 🎵/g" | paste -sd ' ' -;}
+format() { tac | sed "s/^volume:n\/a.*//g;/^volume:/d;s/\\&/&amp;/g;s/\\[paused\\].*/⏸/g;s/\\[playing\\].*/🎵/g" | paste -sd ' ' -;}
 
 pgrep -f sb-mpdup >/dev/null 2>&1 || sb-mpdup >/dev/null 2>&1 &
 
-echo "$mpc" | format
+mpc=$(echo "$mpc" | format)
+[ -n "$mpc" ] && printf " %s " "$mpc"
diff --git a/.local/bin/statusbar/sb-volume b/.local/bin/statusbar/sb-volume
index d499098..b7b0c08 100755
--- a/.local/bin/statusbar/sb-volume
+++ b/.local/bin/statusbar/sb-volume
@@ -9,7 +9,7 @@
 # @description : volume block for dwmblocks
 ######################################################################
 
-[ "1" = $(pulsemixer --get-mute) ] && echo "婢  ---" && exit
+[ "1" = $(pulsemixer --get-mute) ] && echo " 婢  --- " && exit
 
 vol="$(pulsemixer --get-volume | awk -F " " '{ printf "%d", $1 }')"
 
@@ -21,5 +21,5 @@ else
 	icon="奔"
 fi
 
-printf "%s %3d%%" $icon $vol
+printf " %s %3d%% " $icon $vol