diff --git a/files/dwm/dwm.sh b/files/dwm/dwm.sh index 31e9669..e261399 100644 --- a/files/dwm/dwm.sh +++ b/files/dwm/dwm.sh @@ -5,17 +5,17 @@ ## Load System Libs ## if [ -d /etc/X11/xinit/xinitrc.d ]; then - for f in /etc/X11/xinit/xinitrc.d/*; do - [ -x "$f" ] && . "$f" - done - unset f + for f in /etc/X11/xinit/xinitrc.d/*; do + [ -x "$f" ] && . "$f" + done + unset f fi if [ -d /usr/local/etc/X11/xinit/xinitrc.d ]; then - for f in /usr/local/etc/X11/xinit/xinitrc.d/*; do - [ -x "$f" ] && . "$f" - done - unset f + for f in /usr/local/etc/X11/xinit/xinitrc.d/*; do + [ -x "$f" ] && . "$f" + done + unset f fi @@ -35,8 +35,23 @@ xsetroot -solid "$purple" #exec slstatus & # Custom # +source `which volume.function` +source `which battery.function` +source `which storage.function` +if [[ "`storage-root`" == "`storage-home`" ]]; then + storage_cmd=echo 'Storage: `storage-root-dwm`)"' +else + storage_cmd=echo '"Storage(Root:`storage-root-dwm` Home:`storage-home-dwm`)' +fi while true; do - xsetroot -name "`whoami`@`hostname` `date +"%Y-%m-%d %H:%M:%S"`" + readout="$readout Battery: `battery-display`" + readout="$readout | `storage_cmd`" + readout="$readout | `volume-display`" + readout="$readout | `whoami`@`hostname`" + readout="$readout `date +"%Y-%m-%d %H:%M:%S"`" + xsetroot -name "$readout" + readout="" + sleep 0.75 done &