refactor submodules, add xorg, small fixes & changes

[dotfiles.git] / base / .zshrc

diff --git a/base/.zshrc b/base/.zshrc
index 51fcf1e4557612dfd003ca767aa9a068e89b9d14..2dd25ff460a284c708a9b6767d9f7cbf921c7062 100644 (file)
--- a/base/.zshrc
+++ b/base/.zshrc
@@ -1,61 +1,67 @@
-# 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

-# xorg
+KEYTIMEOUT=1
+## xorg

 bindkey    "^[[7~" beginning-of-line #Home
 bindkey -a "^[[7~" beginning-of-line
 bindkey    "^[[8~" end-of-line       #End
 bindkey -a "^[[8~" end-of-line
 bindkey    "^[[3~" delete-char       #Del
 bindkey -a "^[[3~" delete-char
 bindkey    "^[[7~" beginning-of-line #Home
 bindkey -a "^[[7~" beginning-of-line
 bindkey    "^[[8~" end-of-line       #End
 bindkey -a "^[[8~" end-of-line
 bindkey    "^[[3~" delete-char       #Del
 bindkey -a "^[[3~" delete-char

-# bsd vt
-bindkey    "^[[H" beginning-of-line #Home
-bindkey -a "^[[H" beginning-of-line
-bindkey    "^[[F" end-of-line       #End
-bindkey -a "^[[F" end-of-line
-
+## history search

 autoload -Uz up-line-or-beginning-search down-line-or-beginning-search
 zle -N up-line-or-beginning-search
 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
 
 autoload -Uz up-line-or-beginning-search down-line-or-beginning-search
 zle -N up-line-or-beginning-search
 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
 

-# prompt
+### aliases
+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
+## py venv
+alias va="source bin/activate"
+alias vd="deactivate"
+## be paranoid
+alias cp='cp -ip'
+alias mv='mv -i'
+if [[ "$OSTYPE" =~ '^freebsd' ]] {
+    # don't confirm if only a few files are deleted
+    alias rm='rm -I'
+} else {
+    alias rm='rm -i'
+}
+
+### prompt

 setopt prompt_subst
 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
+local f=
+if [[ "$OSTYPE" = "netbsd" && ( "$TERM" = "wsvt25" || "$TERM" =~ '^vt' ) ]] {
+    # fix for wscons
+    f="%F{white}"
+} else {
+    f="%f"
+}
+PROMPT='%F{$VICOL}%n'"$f"'@%F{$VICOL}%2m'"$f"'%(?../%F{red}$?'"$f"')%# '
+RPROMPT='%F{yellow}${vcs_info_msg_0_:-%~}'"$f"' %T'

 
 

+## change color based on zle vi mode

 function zle-line-init zle-keymap-select {
     VICOL="${${KEYMAP:/vicmd/red}:/(main|viins)/green}"
     zle reset-prompt
 function zle-line-init zle-keymap-select {
     VICOL="${${KEYMAP:/vicmd/red}:/(main|viins)/green}"
     zle reset-prompt


@@ -63,35 +69,87 @@ function zle-line-init zle-keymap-select {
 zle -N zle-line-init
 zle -N zle-keymap-select
 
 zle -N zle-line-init
 zle -N zle-keymap-select
 

-# common aliases
-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"
-function s { sysctl hw.snd.default_unit${1:+=$1} }
+## vcs
+autoload -Uz vcs_info
+zstyle ':vcs_info:*' enable git
+zstyle ':vcs_info:git*' formats       '%c%u%%F{green}%r/%b%%F{white}/%%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}*"

 
 

-# be paranoid
-alias cp='cp -ip'
-alias mv='mv -i'
-alias rm='rm -I'
+unset f
+
+### hooks
+local _exectime=
+function precmd {
+    # change terminal title
+    print -Pn "\e]2;%(1j,%j,)%#${SSH_CLIENT+$USER@$HOST:}%~\e\\"
+    # update vcs
+    vcs_info
+    # bell if exec takes 5s
+    if ((SECONDS - _exectime >= 5)) print "\a"
+}
+function preexec {
+    # change terminal title to show command
+    print -Pnf "\e]2;%s\e\\" "%#${SSH_CLIENT+$USER@$HOST:}$1"
+    # save last exec time for bell
+    _exectime=$SECONDS
+}
+function chpwd {
+    l
+}

 
 

-# venv
-alias activate="source bin/activate"
+### system-specific configs and aliases
+case "$OSTYPE"; in
+    freebsd*)
+        ## vt binds
+        bindkey    "^[[H" beginning-of-line  #Home
+        bindkey -a "^[[H" beginning-of-line
+        bindkey    "^[[F" end-of-line        #End
+        bindkey -a "^[[F" end-of-line

 
 

-# ports
-function portpkg {
-    case "$1" {
-        build|run) ;;
-        *)
-            echo "Usage: \`portpkg <build|run>' in a port directory"
-            return 1;;
-    }
-    sudo pkg install -AU $(make ${1}-depends-list |
+        ## sound
+        function s { sysctl hw.snd.default_unit${1:+\=$1} }
+        alias vol mixer
+
+        ## install port dependencies from pkg (like pkgsrc `bmake bin-install')
+        #XXX: should probably use package-depends where possible, breaks when
+        #     port name is different to package name
+        #     (eg. graphics/sdl20 == sdl2, devel/glib20 == glib2, etc)
+        function portpkg {
+            case "$1" {
+            build|run)
+                sudo pkg install -AU $(make ${1}-depends-list |

                            sed 's_/usr/ports/_ _' | tr -d '\n')
                            sed 's_/usr/ports/_ _' | tr -d '\n')

-}
+                ;;
+            *)  echo "Usage: \`portpkg <build|run>' in a port directory"
+                return 1;;
+            }
+        };;
+    netbsd)
+        ## sound
+        function s {
+            if [[ -z "$1" ]] {
+                ll /dev/mixer /dev/sound /dev/audio
+                return
+            }
+            for x in mixer sound audio; do
+                ln -sf /dev/$x"$1" /dev/$x
+            done
+        }
+        function vol {
+            if [[ -z "$1" ]] {
+                for x in $(mixerctl -a | grep 'outputs\.master'); do
+                    echo $x
+                done
+                return
+            }
+            mixerctl -w outputs.master"$2"="$1"
+        };;
+esac

 
 # The following lines were added by compinstall
 zstyle ':completion:*' auto-description 'specify: %d'
 
 # The following lines were added by compinstall
 zstyle ':completion:*' auto-description 'specify: %d'