.zshrc changes

[dotfiles.git] / base / .zshrc

diff --git a/base/.zshrc b/base/.zshrc
index 4a68c80463fbf4cac173e5557db0ca151c180661..228588972499dff50d3d926b5f517afb4787fe5e 100644 (file)
--- a/base/.zshrc
+++ b/base/.zshrc
@@ -35,36 +35,36 @@ 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'
-
-# venv
-alias activate="source bin/activate"
-
 # ports
 function portpkg {
     case "$1" {
-        build|run) ;;
-        *)
-            echo "Usage: \`portpkg <build|run>' in a port directory"
+        build|run)
+            sudo pkg install -AU $(make ${1}-depends-list |
+                                   sed 's_/usr/ports/_ _' | tr -d '\n')
+            ;;
+        *)  echo "Usage: \`portpkg <build|run>' in a port directory"
             return 1;;
     }
-    sudo pkg install -AU $(make ${1}-depends-list |
-                           sed 's_/usr/ports/_ _' | tr -d '\n')
 }
 
 ## 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 {
@@ -76,24 +76,33 @@ 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}*"
 
+# hooks
 function precmd {
+    # change terminal title
     print -Pn "\e]0;%(1j,%j,)%#${SSH_CLIENT+$USER@$HOST:}%~\a"
+    # update vcs
     vcs_info
-    if ((SECONDS - _exectime >= 5)) {
-        # bell if exec takes 5s
-        print "\a"
-    }
+    # bell if exec takes 5s
+    if ((SECONDS - _exectime >= 5)) print "\a"
 }
 function preexec {
-    # change Xorg title
+    # change terminal title to show command
     print -Pnf "\e]0;%s\a" "%#${SSH_CLIENT+$USER@$HOST:}$1"
-    # save last exec time
+    # save last exec time for bell
     _exectime=$SECONDS
 }
+function chpwd {
+    l
+}
 
 # The following lines were added by compinstall
 zstyle ':completion:*' auto-description 'specify: %d'