From 8fc4c4b3825e421373d836ef0841b3e7c15ebb9f Mon Sep 17 00:00:00 2001
From: David Runge <david.runge@frqrec.com>
Date: Tue, 26 Nov 2013 23:38:53 +0100
Subject: Added removal of /usr/bin/X11 in
 /usr/local/sbin:/usr/local/bin:/home/dave/bin:/usr/bin:/opt/android-sdk/tools:/usr/bin/vendor_perl:/usr/bin/core_perl:/home/dave/.rvm/bin:/home/dave/.yadr/bin:/home/dave/.yadr/bin/yadr
 when in unixpool

---
 .xinitrc               | 30 ++++++++++++++++--------------
 .zsh.after/unixpool.sh |  8 ++++++--
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/.xinitrc b/.xinitrc
index ee125fc..8b09d43 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -3,20 +3,22 @@
 #source /etc/X11/xinit/xinitrc.d/30-dbus
 #Start GNOME Keyring
 #val $(/usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh)
- #You probably need to do this too:
-    # export GNOME_KEYRING_CONTROL GNOME_KEYRING_PID GPG_AGENT_INFO SSH_AUTH_SOCK
+#You probably need to do this too:
+# export GNOME_KEYRING_CONTROL GNOME_KEYRING_PID GPG_AGENT_INFO SSH_AUTH_SOCK
 
 
-  #X11 keyboard maps
-  setxkbmap -layout de
-  setxkbmap -option ''
-  setxkbmap -option 'grp:alt_space_toggle'
-  setxkbmap -option 'grp:shift_toggle'
-  setxkbmap -option 'grp_led:caps'
-  setxkbmap -option 'caps:escape'
-  #setxkbmap -option 'ctrl:swapcaps'
-  #setxkbmap -option 'ctrl:nocaps'
+#/usr/bin/awesome &> ~/.log/awesome.log &
 
-  #if [ -f $HOME/.Xmodmap ]; then
-  #    /usr/bin/xmodmap $HOME/.Xmodmap
-  #fi
+#X11 keyboard maps
+setxkbmap -layout de
+setxkbmap -option ''
+setxkbmap -option 'grp:alt_space_toggle'
+setxkbmap -option 'grp:shift_toggle'
+setxkbmap -option 'grp_led:caps'
+setxkbmap -option 'caps:escape'
+#setxkbmap -option 'ctrl:swapcaps'
+#setxkbmap -option 'ctrl:nocaps'
+
+#if [ -f $HOME/.Xmodmap ]; then
+#    /usr/bin/xmodmap $HOME/.Xmodmap
+#fi
diff --git a/.zsh.after/unixpool.sh b/.zsh.after/unixpool.sh
index ca46eeb..9e735d8 100644
--- a/.zsh.after/unixpool.sh
+++ b/.zsh.after/unixpool.sh
@@ -1,16 +1,18 @@
 # host based zshrc
 # unixpool
 
+autoload -U regexp-replace
+
 #HISTFILE=$HOME/.zhistory
 PATH=${PATH}:/net/local64/bin
 PATH=${PATH}:/net/adm/bin
 PATH=${PATH}:/net/adm/scripts
 PATH=${PATH}:/net/adm/xadm
 PATH=${PATH}:/homes/wheel/wheel/bin
-
 #PATH=/store/s4/android/android-sdk-linux_86/tools:$PATH
 #PATH=/store/s4/android/android-sdk-linux_86/platform-tools:$PATH
-#TODO: add pacman to apt-get conversion for all pacman aliases
+#Remove /usr/bin/X11: if it shows up in $PATH
+regexp-replace PATH '/usr/bin/X11:' ''
 
 # set pulseaudio server to s4
 if [ -f "`which pax11publish`" ];
@@ -113,3 +115,5 @@ alias QWbig='xterm -geometry 84x41-0+0 -T '\''QWatch'\'' -e /homes/misc/lpviewer
 alias QWbighere='/homes/misc/lpviewer/lpdisp'
 alias QWdisplay="watch 'for n in {1..3}; do scli -c \"show printer display\" ps\$n-pool; done'"
 alias pyadm="/net/adm/pyadm-64ready/start.py"
+
+#TODO: add pacman to apt-get conversion for all pacman aliases
-- 
cgit v1.2.3-54-g00ecf