remove useless vcs_info format atoms

[dotfiles.git] / base / .zshrc

diff --git a/base/.zshrc b/base/.zshrc
index 51fcf1e4557612dfd003ca767aa9a068e89b9d14..013f431a94962994b5f5e5f923e9f326b0d63ff7 100644 (file)
--- a/base/.zshrc
+++ b/base/.zshrc
@@ -1,36 +1,16 @@
-# modules
-autoload -Uz vcs_info
-zstyle ':vcs_info:*' enable git
-zstyle ':vcs_info:*' get-revision true
-zstyle ':vcs_info:git*' formats "(%F{green}%r/%b%f) %m%u%c "
-
-function precmd {
-    print -Pn "\e]0;%(1j,%j,)%#${SSH_CLIENT+$USER@$HOST}:%~\a"
-    vcs_info
-    if ((SECONDS - _exectime >= 5)) {
-        # bell if exec takes 5s
-        print "\a"
-    }
-}
-function preexec {
-    # change Xorg title
-    print -Pnf "\033]0;%s\a" "%#$1"
-    # save last exec time
-    _exectime=$SECONDS
-}
-
-# options
+## options

 setopt autocd extendedglob
 unsetopt beep
 
 setopt autocd extendedglob
 unsetopt beep
 

-# history
+## history

 setopt appendhistory
 HISTFILE=~/.histfile
 HISTSIZE=100
 SAVEHIST=100
 
 setopt appendhistory
 HISTFILE=~/.histfile
 HISTSIZE=100
 SAVEHIST=100
 

-# keys
+## keys

 bindkey -v
 bindkey -v

+KEYTIMEOUT=1

 # xorg
 bindkey    "^[[7~" beginning-of-line #Home
 bindkey -a "^[[7~" beginning-of-line
 # xorg
 bindkey    "^[[7~" beginning-of-line #Home
 bindkey -a "^[[7~" beginning-of-line


@@ -39,9 +19,9 @@ bindkey -a "^[[8~" end-of-line
 bindkey    "^[[3~" delete-char       #Del
 bindkey -a "^[[3~" delete-char
 # bsd vt
 bindkey    "^[[3~" delete-char       #Del
 bindkey -a "^[[3~" delete-char
 # bsd vt

-bindkey    "^[[H" beginning-of-line #Home
+bindkey    "^[[H" beginning-of-line  #Home

 bindkey -a "^[[H" beginning-of-line
 bindkey -a "^[[H" beginning-of-line

-bindkey    "^[[F" end-of-line       #End
+bindkey    "^[[F" end-of-line        #End

 bindkey -a "^[[F" end-of-line
 
 autoload -Uz up-line-or-beginning-search down-line-or-beginning-search
 bindkey -a "^[[F" end-of-line
 
 autoload -Uz up-line-or-beginning-search down-line-or-beginning-search


@@ -50,47 +30,70 @@ zle -N down-line-or-beginning-search
 [[ -n "$key[Up]"   ]] && bindkey -- "$key[Up]"   up-line-or-beginning-search
 [[ -n "$key[Down]" ]] && bindkey -- "$key[Down]" down-line-or-beginning-search
 
 [[ -n "$key[Up]"   ]] && bindkey -- "$key[Up]"   up-line-or-beginning-search
 [[ -n "$key[Down]" ]] && bindkey -- "$key[Down]" down-line-or-beginning-search
 

-# prompt
-setopt prompt_subst
-PROMPT='%F{$VICOL}%n%f@%F{$VICOL}%m%f%(?../%F{red}$?%f)%# '
-RPROMPT='${vcs_info_msg_0_}%F{yellow}%~%f %T'
-KEYTIMEOUT=1
-
-function zle-line-init zle-keymap-select {
-    VICOL="${${KEYMAP:/vicmd/red}:/(main|viins)/green}"
-    zle reset-prompt
-}
-zle -N zle-line-init
-zle -N zle-keymap-select
-
-# common aliases
+## aliases

 alias h="history -25"
 alias j="jobs -l"
 alias h="history -25"
 alias j="jobs -l"

-alias la="ls -AF"
-alias lf="ls -Fdf .* [A-Z]* [^A-Z]*"
-alias ll="ls -AFlho"
-alias LL="ls -Flhodf .* [A-Z]* [^A-Z]*"
-alias pa="sudo ps -Sudax"
+alias l="ls -AF"
+alias ll="ls -lAFho"
+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} }
 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'
 
 
 # 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" {
 # 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;;
     }
             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)%# '
+RPROMPT='%F{yellow}${vcs_info_msg_0_:-%~}%f %T'
+
+function zle-line-init zle-keymap-select {
+    VICOL="${${KEYMAP:/vicmd/red}:/(main|viins)/green}"
+    zle reset-prompt
+}
+zle -N zle-line-init
+zle -N zle-keymap-select
+
+autoload -Uz vcs_info
+zstyle ':vcs_info:*' enable git
+zstyle ':vcs_info:git*' formats       "%c%u%%F{green}%b%%f/%%F{yellow}%S%%f"
+zstyle ':vcs_info:git*' actionformats "%%F{red}(%a)%%f %c%u%%F{green}%b%%f/\
+%%F{yellow}%S%%f"
+zstyle ':vcs_info:git*' check-for-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"
+    vcs_info
+    if ((SECONDS - _exectime >= 5)) {
+        # bell if exec takes 5s
+        print "\a"
+    }
+}
+function preexec {
+    # change Xorg title
+    print -Pnf "\e]0;%s\a" "%#${SSH_CLIENT+$USER@$HOST:}$1"
+    # save last exec time
+    _exectime=$SECONDS

 }
 
 # The following lines were added by compinstall
 }
 
 # The following lines were added by compinstall