X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/821519016af1834f362213a6de807276311981d4..118fb6e074a9e7ebf94fa5fd6c000d44b76fd403:/base/.xinitrc?ds=sidebyside

diff --git a/base/.xinitrc b/base/.xinitrc
index ed72b5e..c0d5993 100755
--- a/base/.xinitrc
+++ b/base/.xinitrc
@@ -18,16 +18,28 @@ if [ -f "$usermodmap" ]; then
 	xmodmap "$usermodmap"
 fi
 
-# session-independent
-xset r rate 290 26
-xset m 1/1 0
+# root image, redshift
 redon &
+"$HOME/.fehbg"
+
+# Xorg settings
+xset r rate 290 26 &
+xset m 1/1 0 &
+
+# root terminal
+#urxvt -name URxvtRoot -override-redirect -geometry x26+0-0 -e glances &
+#xdotool search --limit 1 --sync --classname URxvtRoot windowsize 100% y
+
+# tray icons
+#"$HOME/src/phwmon/phwmon.py" --mem --mem_percent --net --io --bg \#0000 &
+volumeicon &
+
+# daemons
 dunst &
 xautolock -time 10 -locker "$HOME/bin/l" &
 xbanish &
 eval `ssh-agent`
 
-# run terminal daemon
 if [ -x /usr/local/bin/urxvtd ]; then
 	for i in 1 2; do
 		# try to start client twice, once before checking for daemon and
@@ -47,6 +59,11 @@ if [ -x /usr/local/bin/urxvtd ]; then
 	unset i
 fi
 
+# try to wait for session to start
+(sleep 0.1 && tint2) &
+(sleep 0.1 && [ -x "$HOME/bin/acpi_ac" ] && "$HOME/bin/acpi_ac" "0x0`sysctl -n hw.acpi.acline`") &
+(sleep 1.5 && [ -x /usr/local/bin/conky ] && conky -c "$HOME/.conkyrc.d/dock") &
+
 # load any global scripts
 if [ -d /usr/local/etc/X11/xinit/xinitrc.d ]; then
 	for f in /usr/local/etc/X11/xinit/xinitrc.d/?*.sh; do
@@ -55,15 +72,6 @@ if [ -d /usr/local/etc/X11/xinit/xinitrc.d ]; then
 	unset f
 fi
 
-tint2 &
-# sleep for tint to start
-sleep 3
-
-# try to wait for session to start
-(sleep 0.2 && [ -x "$HOME/bin/acpi_ac" ] && "$HOME/bin/acpi_ac" "0x0`sysctl -n hw.acpi.acline`") &
-(sleep 1 && "$HOME/.fehbg") &
-(sleep 1.5 && [ -x /usr/local/bin/conky ] && conky -c "$HOME/.conkyrc.d/dock") &
-
 if [ ! -n "$1" ]; then
 	session=i3
 else
@@ -71,3 +79,6 @@ else
 	shift
 fi
 exec $session "$@"
+
+# cleanup
+ssh-agent -k