2 files changed, 28 insertions, 11 deletions

diff --git a/bin/.local/bin/statusbar b/bin/.local/bin/statusbar
index 00b5d2b..c506244 100755
--- a/bin/.local/bin/statusbar
+++ b/bin/.local/bin/statusbar
@@ -1,29 +1,45 @@
 #!/bin/bash
 
-BOLD='\033[1m'
-BB='\033[00m'
+# Color definitions.
+export BLK="\e[30m"
+export RED="\e[31m"
+export GRN="\e[32m"
+export YLW="\e[33m"
+export BLU="\e[34m"
+export PUR="\e[35m"
+export CYN="\e[36m"
+export RST="\e[0m"
+
+# Other formatting.
+export BLD="\e[1m"
+export DIM="\e[2m"
+export ITA="\e[3m"
+export UND="\e[4m"
+export FLS="\e[5m"
+export REV="\e[7m"
+export INV="\e[8m"
+export STR="\e[9m"
 
 vol(){
     vol=$(pulsemixer --get-volume | awk '{print $1}')
-        echo -e "vol $vol% "
+        echo -e "vol $vol%"
 }
 
 bat() {
         power=$(cat /sys/class/power_supply/BAT0/capacity)
-        echo -e "bat $power% "
+        echo -e "bat $power%"
 }
 
 dte() {
   dte=$(date +"%A, %B %d")
-  echo -e "date $dte "
+  echo -e "date $dte"
 }
 
 tie() {
   tme=$(date +"%I:%M %p")
-  echo -e "time $tme "
+  echo -e "time $tme"
 }
-
 while :; do
-    echo "$(vol) $(bat) $(tie) $(dte)" 
+   echo "$(vol) $(bat) $(tie) $(dte)" 
         sleep 2
 done
diff --git a/x/.xinitrc b/x/.xinitrc
index 4a4f7d0..5ad4ab7 100644
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,9 +1,10 @@
-#exec dbus-launch --exit-with-session spectrwm
-#xrdb ~/.Xresources &
+#!/bin/bash
+#.xinitrc
 xset b off &
 xset s 600 &
 ~/bin/xss &
 ~/.fehbg &
 picom 2>/dev/null &
-xsetroot -name "bat $(cat /sys/class/power_supply/BAT0/capacity)"
+dwmbar &
+
 exec dbus-launch --exit-with-session startdwm