fixed .login_conf, tint2, added ssh-agent, colors

[dotfiles.git] / .xinitrc

diff --git a/.xinitrc b/.xinitrc
index f09cc519fa80d3d439a74074cf22c87a83672998..ed72b5e58ba5481c062fb1cca7a539103ad24215 100755 (executable)
--- a/.xinitrc
+++ b/.xinitrc
@@ -18,19 +18,21 @@ if [ -f "$usermodmap" ]; then
        xmodmap "$usermodmap"
 fi
 
+# session-independent
 xset r rate 290 26
 xset m 1/1 0
 redon &
 dunst &
-tint2 &
 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
                # another after trying to start it
-               urxvtc
+               urxvtc -e exit
                if [ $? -eq 2 ]; then
                        # daemon not started, attempt to start once
                        if [ $i -eq 1 ]; then
@@ -45,12 +47,7 @@ if [ -x /usr/local/bin/urxvtd ]; then
        unset i
 fi
 
-# try to wait for session to start, but not critical
-#XXX: may not be applicable to sessions other than i3
-(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" ) &
-
+# 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
                [ -x "$f" ] && . "$f"
@@ -58,9 +55,19 @@ 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
        session=$1
+       shift
 fi
-exec $session
+exec $session "$@"