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

diff --git a/.Xresources b/.Xresources
index 0ff4d1b1ec493818e19499a25490963a4f1fffa2..2eb9efb88400b150c0fb74c2f721383ab74cd8d6 100644 (file)
--- a/.Xresources
+++ b/.Xresources
@@ -51,6 +51,9 @@
 ! white dark/light
 *color7:                 S_base2
 *color15:                S_base3
 ! white dark/light
 *color7:                 S_base2
 *color15:                S_base3

+! underline
+*colorUL:                S_yellow
+*underlineColor:         S_yellow

 
 
 ! urxvt
 
 
 ! urxvt


@@ -63,12 +66,14 @@ urxvt.cursorUnderline:   on
 urxvt.scrollstyle:       plain
 urxvt.scrollBar_right:   true
 urxvt.urgentOnBell:      true
 urxvt.scrollstyle:       plain
 urxvt.scrollBar_right:   true
 urxvt.urgentOnBell:      true

+urxvt.visualBell: true

 
 

-urxvt*depth:             32
-urxvt.background:        rgba:0000/0e00/1200/ee00
+urxvt.background:        rgba:0000/0a00/0d00/d000

 urxvt.dynamicColors:     true
 urxvt.intensityStyles:   false
 
 urxvt.dynamicColors:     true
 urxvt.intensityStyles:   false
 

+urxvt.print-pipe:        cat > "$HOME/urxvt-$(date +'%Y-%m-%d-%H%M%S')
+

 xvkbd.Alt_R.width:       1
 xvkbd.Meta_R.width:      1
 xvkbd.Multi_key.width:   1
 xvkbd.Alt_R.width:       1
 xvkbd.Meta_R.width:      1
 xvkbd.Multi_key.width:   1

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
 
        xmodmap "$usermodmap"
 fi
 

+# session-independent

 xset r rate 290 26
 xset m 1/1 0
 redon &
 dunst &
 xset r rate 290 26
 xset m 1/1 0
 redon &
 dunst &

-tint2 &

 xautolock -time 10 -locker "$HOME/bin/l" &
 xbanish &
 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
 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
                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
 
        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"
 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
 
        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
 if [ ! -n "$1" ]; then
        session=i3
 else
        session=$1

+       shift

 fi
 fi

-exec $session
+exec $session "$@"

diff --git a/install.sh b/install.sh
index 8f2c3bf3be03634bd6ffae50f6ed849107179fa0..5ac2fae08d3b897c895764655dcd2525c86d6a09 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -6,5 +6,11 @@ ln -vwis "$PWD/i3-config" "$HOME/.config/i3/config"
 ln -vwis "$PWD/i3status-config" "$HOME/.config/i3status/config"
 touch "$HOME/.hushlogin"
 
 ln -vwis "$PWD/i3status-config" "$HOME/.config/i3status/config"
 touch "$HOME/.hushlogin"
 

-#fix permissions
+#fix permissions from git (should probably move this to git hook)

 chmod go= .zshenv .Xresources
 chmod go= .zshenv .Xresources

+#
+#FreeBSD tries `_secure_path' on `.login_conf' before reaading the database,
+#so it needs to be compiled and unlinked for it to actually take effect.
+rm .login_conf.db
+cap_mkdb .login_conf
+unlink .login_conf