refactor submodules, add xorg, small fixes & changes

[dotfiles.git] / base / .xinitrc

diff --git a/base/.xinitrc b/base/.xinitrc
old mode 100755 (executable)
new mode 100644 (file)
index ed72b5e..838c1e9
--- a/base/.xinitrc
+++ b/base/.xinitrc
@@ -18,20 +18,38 @@ if [ -f "$usermodmap" ]; then
        xmodmap "$usermodmap"
 fi
 
        xmodmap "$usermodmap"
 fi
 

-# session-independent
-xset r rate 290 26
-xset m 1/1 0
+# redshift, root image

 redon &
 redon &

+"$HOME/.fehbg"
+
+# Xorg settings
+xset r rate 290 26 &
+xset m 1/1 0 &
+xset s off
+xset dpms 0 0 600
+xset +fp ${XDG_DATA_HOME:-~/share}/fonts/Dina/
+xset fp rehash
+
+# root terminal
+urxvt -name TermBg1 -override-redirect -geometry x5+0--1 \
+      -e tail -F /var/log/messages &
+xdotool search --limit 1 --sync --classname TermBg1 windowsize --usehints 100% 6
+
+# tray icons
+#"$HOME/src/phwmon/phwmon.py" --mem --mem_percent --net --io --bg \#0000 &
+volumeicon &
+
+# daemons

 dunst &
 dunst &

+mpc-notify -d &

 xautolock -time 10 -locker "$HOME/bin/l" &
 xbanish &
 eval `ssh-agent`
 
 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
 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
                urxvtc -e exit
                if [ $? -eq 2 ]; then
                        # daemon not started, attempt to start once


@@ -47,6 +65,14 @@ if [ -x /usr/local/bin/urxvtd ]; then
        unset i
 fi
 
        unset i
 fi
 

+# try to wait for session to start
+#(sleep 0.1 && tint2) &
+#(sleep 0.1 && yabar -c "$HOME/etc/yabar/yabar.conf") &
+#x220t
+(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
 # 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 +81,7 @@ if [ -d /usr/local/etc/X11/xinit/xinitrc.d ]; then
        unset f
 fi
 
        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") &
-
+# start session

 if [ ! -n "$1" ]; then
        session=i3
 else
 if [ ! -n "$1" ]; then
        session=i3
 else


@@ -71,3 +89,7 @@ else
        shift
 fi
 exec $session "$@"
        shift
 fi
 exec $session "$@"

+
+# cleanup
+#TODO: trap this
+ssh-agent -k