add screen lock `l', `share' dir, install.sh edit

[dotfiles.git] / base / .zshrc

diff --git a/base/.zshrc b/base/.zshrc
index 4a68c80463fbf4cac173e5557db0ca151c180661..0424a8125c4254f8770b24b434b966285ca14fe0 100644 (file)
--- a/base/.zshrc
+++ b/base/.zshrc
@@ -41,30 +41,28 @@ alias pa="$p"
 alias spa="sudo $p"
 unset p
 function s { sysctl hw.snd.default_unit${1:+=$1} }
+alias va="source bin/activate"
 
 # 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,9 +74,13 @@ 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*' 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"