From 265845b262c3a4e9c20ec5b8d7699715138605e0 Mon Sep 17 00:00:00 2001
From: randomuser <randomuser@tilde.club>
Date: Mon, 4 Jul 2022 02:02:48 -0500
Subject: [PATCH] switch from simplestatus to status

---
 bspwm/bspwmrc       |  3 +++
 simplestatus/bspwm  | 20 --------------------
 simplestatus/config |  9 ---------
 simplestatus/date   |  5 -----
 simplestatus/power  | 11 -----------
 simplestatus/time   |  5 -----
 simplestatus/volume |  9 ---------
 sx/sxrc             |  2 +-
 sxhkd/sxhkdrc       |  2 +-
 9 files changed, 5 insertions(+), 61 deletions(-)
 delete mode 100755 simplestatus/bspwm
 delete mode 100644 simplestatus/config
 delete mode 100755 simplestatus/date
 delete mode 100755 simplestatus/power
 delete mode 100755 simplestatus/time
 delete mode 100755 simplestatus/volume

diff --git a/bspwm/bspwmrc b/bspwm/bspwmrc
index 025edef..9d22856 100755
--- a/bspwm/bspwmrc
+++ b/bspwm/bspwmrc
@@ -13,4 +13,7 @@ bspc config pointer_follows_focus true
 bspc config pointer_follows_monitor true
 bspc config focus_follows_pointer true
 
+bspc config top_padding 20
+
 bspc rule -a st-gpg-menu state=floating
+bspc rule -a statusbar border=off sticky=on state=floating manage=off
diff --git a/simplestatus/bspwm b/simplestatus/bspwm
deleted file mode 100755
index 8ce8bd9..0000000
--- a/simplestatus/bspwm
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-used_desk=$(bspc query -D -d .occupied --names | tr '\n' ' ')
-current_desk=$(bspc query -D -d .focused --names)
-final_string=""
-current_printed=0
-
-for i in $used_desk; do
-  [ "$i" = "$current_desk" ] && \
-    final_string=${final_string}"%{R}$i%{R} " && \
-    current_printed=1 || \
-    final_string=${final_string}"$i "
-done
-
-[ $current_printed -eq 0 ] &&
-  final_string=${final_string}"%{R}$current_desk%{R}"
-
-printf "%s" "$final_string"
-
-exit
diff --git a/simplestatus/config b/simplestatus/config
deleted file mode 100644
index 4f1685b..0000000
--- a/simplestatus/config
+++ /dev/null
@@ -1,9 +0,0 @@
-module power 7 30
-module time 7 30
-module date 7 30
-module volume 12 30
-module bspwm 10 30
-
-order bspwm date time volume power
-
-format %{l}&%{r}& & & &
diff --git a/simplestatus/date b/simplestatus/date
deleted file mode 100755
index 5dbddec..0000000
--- a/simplestatus/date
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-printf "%s" $(date '+%m-%d')
-
-exit
diff --git a/simplestatus/power b/simplestatus/power
deleted file mode 100755
index 40a1f8c..0000000
--- a/simplestatus/power
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-battery="sbs-20-000b"
-perc=$(cat /sys/class/power_supply/$battery/capacity)
-state=$(
-  cat /sys/class/power_supply/$battery/status | \
-  sed 's/Discharging/↓/g;s/Charging/↑/g'
-)
-printf "%s %s" "$perc" "$state"
-
-exit
diff --git a/simplestatus/time b/simplestatus/time
deleted file mode 100755
index 35fcc3c..0000000
--- a/simplestatus/time
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-printf "%s" $(date '+%R')
-
-exit
diff --git a/simplestatus/volume b/simplestatus/volume
deleted file mode 100755
index dcce443..0000000
--- a/simplestatus/volume
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ "$(ps aux | grep pulseaudio | wc -l)" -eq 2 ]; then
-	text="$(pactl list sinks | awk -F' ' '$1 == "Volume:" {print $5}')"
-	printf "pv%s" "$text"
-else
-	text="$(amixer | grep '^  Front' | awk -F'[' '{ ORS = ""; print substr($2, 1, 3); exit }')"
-	printf "av%s" "$text"
-fi
diff --git a/sx/sxrc b/sx/sxrc
index 175e1a6..b374c72 100755
--- a/sx/sxrc
+++ b/sx/sxrc
@@ -3,7 +3,7 @@ disp
 wallpaper
 
 # statusbar
-status
+statusbar &
 
 # start the wm
 sxhkd &
diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc
index 92d0bde..6984308 100644
--- a/sxhkd/sxhkdrc
+++ b/sxhkd/sxhkdrc
@@ -71,7 +71,7 @@ super + {_,ctrl +,shift + }{h,j,k,l}
 
 super + {_,shift + } {1-9,0}
   bspc {desktop -f,node -d} '^{1-9,10}'; \
-  {killall -10 simplestatus,_}
+  {killall -10 status,_}
 
 super + {t,f,s}
   bspc node -t {tiled,floating,fullscreen}