Merge branch 'master' of github.com:10sr/dotfiles

shrc

@@ -919,13 +919,19 @@ dpaste(){
 
 if inzsh
 then
+    bindkey -e
+
     # http://zsh.sourceforge.net/Guide/zshguide06.html#l147
     autoload compinit; compinit
     unsetopt auto_menu
+    zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
     setopt bash_auto_list
-    bindkey -e
+
     autoload colors; colors
-    zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
+
+    autoload -Uz promptinit
+    promptinit
+    prompt walters
 fi
 
 ######################################
@@ -1060,6 +1066,8 @@ _ps1_bash="\
 ${__my_c4}:: ${__my_cdef}[${__my_c2}\u@\H${__my_cdef}:${__my_c1}\w/${__my_cdef}]\$(__my_ps1_git)\$(__my_ps1_bttry)\$(__my_ps1_ipaddr)\$(__my_ps1_moc)\n\
 ${__my_c4}:: ${__my_cdef}l${SHLVL}n\#j\js\$laststatus $(__my_ps1_scale)\D{%T} ${__my_ps1_str}\$(__my_alert_fail)\$ "
 inbash && PS1=$_ps1_bash
+_ps1_zsh="$_ps1_bash"
+#inzsh && PS1="$_ps1_zsh"
 
 __my_set_screen_title(){
     if test -n "$TMUX" && test -z "$INSIDE_EMACS"