X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=zsh%2F.zsh%2Frc%2F015prompt.zsh;h=abd25029b242806f692185b508cba7673a86cd11;hb=28dfc8987d9846b34bc3ed9fbf682b70d69db9d3;hp=0ea55ad42b5dd542bb995a038c665873df307413;hpb=a0f0bffe17d0cb300a1261eb17f884c93ad5af27;p=dotfiles.git

diff --git a/zsh/.zsh/rc/015prompt.zsh b/zsh/.zsh/rc/015prompt.zsh
index 0ea55ad..abd2502 100644
--- a/zsh/.zsh/rc/015prompt.zsh
+++ b/zsh/.zsh/rc/015prompt.zsh
@@ -1,12 +1,15 @@
 setopt PROMPT_SUBST
 
-PS1="%2~ %B"
-PS1+='${(j::)psvar}'
-PS1+="%(1j.%j.)%b"
-PS1+='%U${vcs_info_msg_0_}%u'
-PS1+="%(?.. %S%?%s)"
-PS1+='%(1S. %B${SECONDS}%b.)'
-PS1+='%B%F{magenta}%#%f%b '
+PROMPT="%2~ %B"
+# A: autoenv
+# V: virtualenv
+# M: laxed umask
+PROMPT+='${(j::)psvar}'
+PROMPT+="%(1j.%j.)%b"
+PROMPT+='%U${vcs_info_msg_0_}%u'
+PROMPT+="%(?.. %S%?%s)"
+PROMPT+='%(1S. %B${SECONDS}%b.)'
+PROMPT+='%B%F{magenta}%#%f%b '
 
 function zle-line-init zle-keymap-select {
     local ccolour=red
@@ -18,6 +21,9 @@ function zle-line-init zle-keymap-select {
     [[ -z "$VIRTUAL_ENV" ]] && psvar=(${psvar#V}) || {
         [[ -n "${psvar[(r)V]}" ]] || psvar=(V $psvar)
     }
+    [[ `umask` == "077" ]] && psvar=(${psvar#M}) || {
+        [[ -n "${psvar[(r)M]}" ]] || psvar=("M" $psvar)
+    }
     zle reset-prompt
 }
 
@@ -30,5 +36,5 @@ preexec() {
 
 precmd() {
     printf "\a\e]2;\e\\"
-    vcs_info
+    [[ -n "$NO_VCS_INFO" ]] || vcs_info
 }