6 files changed, 46 insertions, 12 deletions

diff --git a/bin/.local/bin/screenshot b/bin/.local/bin/screenshot
index 107faf7..100bbe2 100755
--- a/bin/.local/bin/screenshot
+++ b/bin/.local/bin/screenshot
@@ -1,10 +1,10 @@
 #!/bin/bash
 screenshot() {
         case $1 in
-        full)
+        f*)
                 scrot -m
                 ;;
-        window)
+        w*)
                 sleep 1
                 scrot -s
                 ;;
diff --git a/bin/.local/bin/shut b/bin/.local/bin/shut
index 801d5bf..76a7bd0 100755
--- a/bin/.local/bin/shut
+++ b/bin/.local/bin/shut
@@ -3,8 +3,8 @@
 RET=$(echo -e "shutdown\nreboot\nsleep\nlock\ncancel" | dmenu -l 5 -p "Sayonara" -nb "#000000" -nf "#bfbfbf" -sb "#84a0c6" -sf "#000000" -fn "Hermit:size=10")
 
 case $RET in
-        shutdown) sudo poweroff ;;
-        reboot) sudo reboot ;;
+        shutdown) doas poweroff ;;
+        reboot) doas reboot ;;
         sleep) xset s activate & sudo zzz ;;
         lock) xset s activate ;;
         *) ;;
diff --git a/bin/.local/bin/statusbar b/bin/.local/bin/statusbar
index 433b4d5..00b5d2b 100755
--- a/bin/.local/bin/statusbar
+++ b/bin/.local/bin/statusbar
@@ -5,22 +5,22 @@ BB='\033[00m'
 
 vol(){
     vol=$(pulsemixer --get-volume | awk '{print $1}')
-        echo -e "+@fg=1;vol+@fg=0; $vol% "
+        echo -e "vol $vol% "
 }
 
 bat() {
         power=$(cat /sys/class/power_supply/BAT0/capacity)
-        echo -e "+@fg=1;bat+@fg=0; $power% "
+        echo -e "bat $power% "
 }
 
 dte() {
   dte=$(date +"%A, %B %d")
-  echo -e "+@fg=1;date+@fg=0; $dte "
+  echo -e "date $dte "
 }
 
 tie() {
   tme=$(date +"%I:%M %p")
-  echo -e "+@fg=1;time+@fg=0; $tme "
+  echo -e "time $tme "
 }
 
 while :; do
diff --git a/picom/.config/picom.conf b/picom/.config/picom.conf
index 68c6ee5..1856f93 100644
--- a/picom/.config/picom.conf
+++ b/picom/.config/picom.conf
@@ -37,8 +37,8 @@ blur-background-exclude = [
 ];
 opacity-rule = [ 
     "40:class_g = 'Bspwm' && class_i = 'presel_feedback'",
-    "100:class_g = 'URxvt' && focused",
-    "95:class_g = 'URxvt' && !focused"
+    "100:class_g = 'st-256color' && focused",
+    "95:class_g = 'st-256color' && !focused"
 ];
 
 ## FADING
diff --git a/spectrwm/.config/spectrwm/statusbar b/spectrwm/.config/spectrwm/statusbar
new file mode 100755
index 0000000..c90c1df
--- /dev/null
+++ b/spectrwm/.config/spectrwm/statusbar
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+BOLD='\033[1m'
+BB='\033[00m'
+
+vol(){
+    vol=$(pulsemixer --get-volume | awk '{print $1}')
+        echo -e "+@fg=1;vol+@fg=0; $vol% "
+}
+
+bat() {
+        power=$(cat /sys/class/power_supply/BAT0/capacity)
+        echo -e "+@fg=1;bat+@fg=0; $power% "
+}
+
+dte() {
+  dte=$(date +"%A, %B %d")
+  echo -e "+@fg=1;date+@fg=0; $dte "
+}
+
+tie() {
+  tme=$(date +"%I:%M %p")
+  echo -e "+@fg=1;time+@fg=0; $tme "
+}
+
+while :; do
+    echo "$(vol) $(bat) $(tie) $(dte)" 
+        sleep 2
+done
+
diff --git a/x/.xinitrc b/x/.xinitrc
index 8a24678..4a4f7d0 100644
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,5 +1,9 @@
 #exec dbus-launch --exit-with-session spectrwm
-xrdb ~/.Xresources &
+#xrdb ~/.Xresources &
 xset b off &
 xset s 600 &
-exec dbus-launch --exit-with-session spectrwm
+~/bin/xss &
+~/.fehbg &
+picom 2>/dev/null &
+xsetroot -name "bat $(cat /sys/class/power_supply/BAT0/capacity)"
+exec dbus-launch --exit-with-session startdwm