add git pushall alias to .gitconfig

[dotfiles.git] / base / .zshrc

diff --git a/base/.zshrc b/base/.zshrc
index afda9575ab4d8a99b31e3715ac16e5996351a438..e68c85bf66dcd734552dc3c2617685644dffd04b 100644 (file)
--- a/base/.zshrc
+++ b/base/.zshrc
@@ -35,19 +35,21 @@ alias h="history -25"
 alias j="jobs -l"
 alias l="ls -AF"
 alias ll="ls -lAFho"
+# ps
 local p="ps -aSdxwwouser=USR -ogroup=GRP -opid,nice=N \
          -o%cpu,%mem,tt,stat,start=START -oetime,command | ${PAGER:-more} -Se"
 alias pa="$p"
 alias spa="sudo $p"
 unset p
-function s { sysctl hw.snd.default_unit${1:+=$1} }
+# sound source
+function s { sysctl hw.snd.default_unit${1:+\=$1} }
+# py venv
 alias va="source bin/activate"
-
+alias vd="deactivate"
 # be paranoid
 alias cp='cp -ip'
 alias mv='mv -i'
 alias rm='rm -I'
-
 # ports
 function portpkg {
     case "$1" {
@@ -62,7 +64,7 @@ function portpkg {
 
 ## prompt
 setopt prompt_subst
-PROMPT='%F{$VICOL}%n%f@%F{$VICOL}%m%f%(?../%F{red}$?%f)%# '
+PROMPT='%F{$VICOL}%n%f@%F{$VICOL}%2m%f%(?../%F{red}$?%f)%# '
 RPROMPT='%F{yellow}${vcs_info_msg_0_:-%~}%f %T'
 
 function zle-line-init zle-keymap-select {
@@ -74,9 +76,14 @@ zle -N zle-keymap-select
 
 autoload -Uz vcs_info
 zstyle ':vcs_info:*' enable git
-zstyle ':vcs_info:*' get-revision true
-zstyle ':vcs_info:git*' formats "%%F{green}[%b]%m%u%c%%f %S"
-zstyle ':vcs_info:git*' actionformats "%%F{red}(%a) %%F{green}[%b]%m%u%c%%f %S"
+zstyle ':vcs_info:git*' formats       "%c%u%%F{green}%r/%b%%f/%%F{yellow}%S%%f"
+zstyle ':vcs_info:git*' actionformats "%%F{red}(%a)%%f %c%u%%F{green}%r/%b%%f/\
+%%F{yellow}%S%%f"
+#zstyle ':vcs_info:git*' check-for-changes true #too slow
+zstyle ':vcs_info:git*:.dotfiles' check-for-changes true
+zstyle ':vcs_info:git*' check-for-staged-changes true
+zstyle ':vcs_info:git*' stagedstr   "%F{blue}+"
+zstyle ':vcs_info:git*' unstagedstr "%F{red}*"
 
 function precmd {
     print -Pn "\e]0;%(1j,%j,)%#${SSH_CLIENT+$USER@$HOST:}%~\a"