Merge branch 'master' of tardis:/dotfiles

diff --git a/Xmodmap_chronos b/Xmodmap_chronos
new file mode 100644 (file)
index 0000000..12296c3
--- /dev/null
+++ b/Xmodmap_chronos
@@ -0,0 +1,3 @@
+! remap Caps_Lock as Escape
+remove Lock = Caps_Lock
+keysym Caps_Lock = Escape

diff --git a/zshrc b/zshrc
index cd62f3fd8aa29ac26ff1f1cdf7a6838f7f971ccd..f319e498729b3fa2d3f04870522fcece247c9f0b 100644 (file)
--- a/zshrc
+++ b/zshrc
@@ -30,6 +30,7 @@ setopt dvorak       # correct_all uses dvorak
 # populate path
 typeset -U path     # make path a unique array
 [[ -d ~/bin ]] && path=(~/bin $path)
+[[ -d /extra ]] && path=($path /extra/bin /extra/usr/bin /extra/sbin /extra/usr/sbin)
 [[ -d /opt/android-sdk ]] && path=($path /opt/android-sdk/platform-tools)
 
 # source aliases