From 0923914a13157a93bd6eb854a0e4e4db09e6dc08 Mon Sep 17 00:00:00 2001
From: Akelge <akelge@gmail.com>
Date: Fri, 4 Jan 2013 16:02:29 +0000
Subject: [PATCH] Light changes to prompt files with .off extension are ignored
 Disabled coreutils and dsFunctions on Darwin

---
 zsh/zsh.d/00-options                                  |  7 +++++++
 zsh/zsh.d/10-environment                              | 11 +++++++----
 zsh/zsh.d/20-bindkeys                                 |  3 ---
 zsh/zsh.d/{30-termcolors => 20-termcolors}            |  4 +++-
 zsh/zsh.d/30-prompt                                   |  7 ++++++-
 zsh/zsh.d/Darwin/50-darwin                            |  5 ++---
 zsh/zsh.d/Darwin/{90-coreutils => 90-coreutils.off}   |  0
 .../Darwin/{90-dsFunctions => 90-dsFunctions.off}     |  0
 zsh/zshrc                                             |  3 ++-
 9 files changed, 27 insertions(+), 13 deletions(-)
 rename zsh/zsh.d/{30-termcolors => 20-termcolors} (90%)
 rename zsh/zsh.d/Darwin/{90-coreutils => 90-coreutils.off} (100%)
 rename zsh/zsh.d/Darwin/{90-dsFunctions => 90-dsFunctions.off} (100%)

diff --git a/zsh/zsh.d/00-options b/zsh/zsh.d/00-options
index 8be6c31..7c1534e 100644
--- a/zsh/zsh.d/00-options
+++ b/zsh/zsh.d/00-options
@@ -1,3 +1,5 @@
+setopt ALL_EXPORT
+
 setopt ALWAYS_TO_END
 setopt APPEND_HISTORY
 setopt AUTONAMEDIRS
@@ -12,13 +14,18 @@ setopt HIST_NO_STORE
 setopt HIST_REDUCE_BLANKS
 setopt LIST_TYPES
 setopt LONG_LIST_JOBS
+
 setopt no_BEEP
 setopt no_HUP
 setopt NOTIFY
 setopt PATH_DIRS
 setopt SHORT_LOOPS
 
+setopt prompt_subst
+
 setopt AUTO_CD
 setopt AUTO_MENU
 setopt no_MENU_COMPLETE
 setopt AUTO_LIST
+
+#  vim: set ts=4 sw=4 tw=0 ft=zsh : 
diff --git a/zsh/zsh.d/10-environment b/zsh/zsh.d/10-environment
index dc189ef..804560d 100644
--- a/zsh/zsh.d/10-environment
+++ b/zsh/zsh.d/10-environment
@@ -3,9 +3,6 @@
 
 ## Vars used always
 PATH="/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/local/sbin:/usr/sbin:/sbin:$HOME/bin:."
-SAVEHIST=500
-HISTFILE=~/.history
-HISTSIZE=10000
 LANG="it_IT.UTF-8"
 TZ='Europe/Rome'
 MIBS=all
@@ -15,15 +12,21 @@ LOGD=/var/log
 [ -z "$PS1" ] && return
 
 ## Vars only for interactive sessions
+SAVEHIST=500
+HISTFILE=~/.history
+HISTSIZE=10000
+
 PYTHONSTARTUP=~/.pythonrc.py
 LOGCHECK=30
 REPORTTIME=15
 WATCH=notme
 WATCHFMT="%n %a %l (%m) at %t."
 
-# Hack for svn
 EDITOR=vim
 VISUAL=vim
+#
+# Hack for svn
+# export SVN_EDITOR=${VISUAL}
 
 # Set umask to collaborative mode
 umask 002
diff --git a/zsh/zsh.d/20-bindkeys b/zsh/zsh.d/20-bindkeys
index adf6850..aeb8414 100644
--- a/zsh/zsh.d/20-bindkeys
+++ b/zsh/zsh.d/20-bindkeys
@@ -8,7 +8,4 @@ bindkey  "\eOA" history-search-backward
 bindkey  "\eOB" history-search-forward
 bindkey  "\e[A" history-search-backward
 bindkey  "\e[B" history-search-forward
-bindkey "\e[5D" backward-word
-bindkey "\e[5C" forward-word
-bindkey "" vi-backward-kill-word
 #  vim: set ts=4 sw=4 tw=0 ft=zsh : 
diff --git a/zsh/zsh.d/30-termcolors b/zsh/zsh.d/20-termcolors
similarity index 90%
rename from zsh/zsh.d/30-termcolors
rename to zsh/zsh.d/20-termcolors
index bdfc86a..751d836 100644
--- a/zsh/zsh.d/30-termcolors
+++ b/zsh/zsh.d/20-termcolors
@@ -7,7 +7,9 @@ fi
 for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do
     eval PR_$color='%{$terminfo[bold]$fg[${(L)color}]%}'
     eval PR_LIGHT_$color='%{$fg[${(L)color}]%}'
-    (( count = $count + 1 ))
+    # (( count = $count + 1 ))
 done
 PR_NO_COLOR="%{$terminfo[sgr0]%}"
+
+unset color
 #  vim: set ts=4 sw=4 tw=0 ft=zsh : 
diff --git a/zsh/zsh.d/30-prompt b/zsh/zsh.d/30-prompt
index 29a1f20..fa8e3b3 100644
--- a/zsh/zsh.d/30-prompt
+++ b/zsh/zsh.d/30-prompt
@@ -2,7 +2,12 @@
 # Setup PROMPT
 if [ ${TERM[0,5]} = "xterm" ] || [ ${TERM} = "rxvt" ]; then
   # We are on xterminal
-  PS1="%{]2;%n@%m:%.%}%{]1; %m:%. %}%B<%l> %~ %#%b "
+  W="%{]2;::: %n at %m in %. :::%}"
+  I="%{]1;%m::%.%}"
+  L="%B${PR_BLUE}%3~ %#%b "
+  PS1="$W$I$L"
+  unset W I L
+
 else
   # We are not on xterminal
   PS1="%B[%l] %n@%m:%~ %#%b "
diff --git a/zsh/zsh.d/Darwin/50-darwin b/zsh/zsh.d/Darwin/50-darwin
index 93b3178..cb6d036 100644
--- a/zsh/zsh.d/Darwin/50-darwin
+++ b/zsh/zsh.d/Darwin/50-darwin
@@ -1,14 +1,13 @@
 # Darwin/OSX
 # Environment and aliases for OSX
 export LSCOLORS="GxgxcxdxCxegedabagacad"
-alias aquamacs='open -a Aquamacs\ Emacs'
 alias ldd='otool -L'
 alias ls='ls -F -G'
 alias skill=killall
 alias lsrebuild='/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Support/lsregister -kill -r -domain local -domain system -domain user'
-alias ipython='ipython-2.6 '
 
 alias vim='/Applications/MacVim.app/Contents/MacOS/Vim'
-alias mvim='mvim --remote-tab-silent '
+# alias mvim='mvim --remote-tab-silent '
+alias mvim='open -a MacVim '
 
 #  vim: set ts=4 sw=4 tw=0 ft=zsh : 
diff --git a/zsh/zsh.d/Darwin/90-coreutils b/zsh/zsh.d/Darwin/90-coreutils.off
similarity index 100%
rename from zsh/zsh.d/Darwin/90-coreutils
rename to zsh/zsh.d/Darwin/90-coreutils.off
diff --git a/zsh/zsh.d/Darwin/90-dsFunctions b/zsh/zsh.d/Darwin/90-dsFunctions.off
similarity index 100%
rename from zsh/zsh.d/Darwin/90-dsFunctions
rename to zsh/zsh.d/Darwin/90-dsFunctions.off
diff --git a/zsh/zshrc b/zsh/zshrc
index bb47ff2..8596c91 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -12,7 +12,8 @@ KERNLIB="${LIBRARY}/${KERNEL}"
 
 function loadRC {
     if [ -d $1 ]; then
-        for zshFile in $1/*[^~]; do
+        # for zshFile in $1/*[^~]; do
+        for zshFile in $1/*[^off\|~]; do
             . $zshFile
         done
     fi