add %r to vcs_info

[dotfiles.git] / base / .xinitrc

diff --git a/base/.xinitrc b/base/.xinitrc
index c0d5993eb3563413ceb7e98e53516c189e843fbb..5bda964a54b23fbc6b72fc7b6ca4d754cb4fd971 100755 (executable)
--- a/base/.xinitrc
+++ b/base/.xinitrc
@@ -18,17 +18,20 @@ if [ -f "$usermodmap" ]; then
        xmodmap "$usermodmap"
 fi
 
-# root image, redshift
+# redshift, root image
 redon &
 "$HOME/.fehbg"
 
 # Xorg settings
 xset r rate 290 26 &
 xset m 1/1 0 &
+xset s off
+xset dpms 0 0 600
 
 # root terminal
-#urxvt -name URxvtRoot -override-redirect -geometry x26+0-0 -e glances &
-#xdotool search --limit 1 --sync --classname URxvtRoot windowsize 100% y
+urxvt -name URxvtBG -override-redirect -geometry x5+0-0 \
+      -e tail -f /var/log/messages &
+xdotool search --limit 1 --sync --classname URxvtBG windowsize -usehints 100% 6
 
 # tray icons
 #"$HOME/src/phwmon/phwmon.py" --mem --mem_percent --net --io --bg \#0000 &
@@ -42,8 +45,8 @@ eval `ssh-agent`
 
 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
+               # try to start client twice, once before checking for daemon
+               # and another after trying to start it
                urxvtc -e exit
                if [ $? -eq 2 ]; then
                        # daemon not started, attempt to start once
@@ -61,7 +64,8 @@ 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 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
@@ -72,6 +76,7 @@ if [ -d /usr/local/etc/X11/xinit/xinitrc.d ]; then
        unset f
 fi
 
+# start session
 if [ ! -n "$1" ]; then
        session=i3
 else
@@ -81,4 +86,5 @@ fi
 exec $session "$@"
 
 # cleanup
+#TODO: trap this
 ssh-agent -k