clean .zprofile vars, update zsh opts, fix dpass

[dotfiles.git] / base / .zshrc

diff --git a/base/.zshrc b/base/.zshrc
index 393d2298b8eddbc23188630f53b6df5d7e51c9c6..e06c318d6ba169aa77f41d76b5c611b4d41c203f 100644 (file)
--- a/base/.zshrc
+++ b/base/.zshrc
@@ -1,12 +1,23 @@
-### options
-setopt autocd extendedglob
-unsetopt beep
+### user-local fpath
+fpath=(~/.zsh ~/.zsh/functions/Prompts "${fpath[@]}")
 
-### history
-setopt appendhistory
+### options
+setopt NO_BEEP NO_CLOBBER
+## cd
+setopt AUTO_CD CDABLE_VARS
+## completion
+setopt GLOB_COMPLETE
+## line
+setopt EXTENDED_GLOB GLOB_DOTS MARK_DIRS NOMATCH NUMERIC_GLOB_SORT
+## prompt
+setopt PROMPT_SUBST
+## jobs
+setopt AUTO_CONTINUE
+## history
+setopt NO_HIST_SAVE_BY_COPY HIST_IGNORE_DUPS SHARE_HISTORY
 HISTFILE=~/.histfile
-HISTSIZE=100
-SAVEHIST=100
+HISTSIZE=1000
+SAVEHIST=1000
 
 ### keys
 bindkey -v
@@ -19,24 +30,32 @@ bindkey -a "^[[8~" end-of-line
 bindkey    "^[[3~" delete-char       #Del
 bindkey -a "^[[3~" delete-char
 ## 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 && {
+    if [[ -n "$key[Up]"   ]] {
+        zle -N up-line-or-beginning-search
+        bindkey -- "$key[Up]"   up-line-or-beginning-search
+    }
+    if [[ -n "$key[Down]" ]] {
+        bindkey -- "$key[Down]" down-line-or-beginning-search
+        zle -N down-line-or-beginning-search
+    }
+}
 
 ### aliases
 alias h="history -25"
 alias j="jobs -l"
 alias l="ls -AF"
+alias e="${EDITOR:-vi}" # TODO: make sure vi is there or use safe default
 if [[ "$OSTYPE" =~ '^(free|net)bsd' ]] {
     alias ll="ls -lAFho"
 } else {
     alias ll="ls -lAFh"
 }
 ## ps
-local p=""
-if { which pstree >/dev/null 2>&1 && [[ ! "$(readlink -f $(which pstree))" =~ "/busybox" ]] } {
+local p=
+if { which pstree >/dev/null 2>&1 && \
+  [[ ! "$(readlink -f $(which pstree))" =~ "/busybox" ]] } {
+    # use pstree, but NOT busybox pstree because it kinda sucks
     p="pstree -wg3"
 } elif [[ "$OSTYPE" =~ '^freebsd' ]] {
     p="ps -aSdfxwwouser=USR -ogroup=GRP -opid,nice=NI \
@@ -66,54 +85,24 @@ if [[ "$OSTYPE" =~ '^freebsd' ]] {
     # don't confirm if only a few files are deleted
     alias rm='rm -I'
 } else {
-    # TODO: similar behavior for non-freebsd
+    # TODO: similar behavior for non-freebsd, or impliment in zsh
     alias rm='rm -i'
 }
-
-### prompt
-setopt prompt_subst
-# DEPR: color reset added to NetBSD in PR/53245, following is not needed for recent releases
-#local f=
-#XXX: can't think of a way to tell if ssh client is on wscons, just kludge 24/7
-#if [[ "$OSTYPE" = "netbsd" && ( "$TERM" =~ "^wsvt" || "$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
+## go up directories
+function up() {
+    cd $(printf '../%.0s' {1..${1:-1}})
 }
-zle -N zle-line-init
-zle -N zle-keymap-select
-
-## 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}*"
-
-#unset f
 
 ### hooks
 local _exectime=
 function precmd {
     # change terminal title
+    # TODO: update and send BEL when job status changes
     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"
+    # we could update vcs_info here, but let prompt take care of it
+    # if it doesn't use vcs, it can be ignored safely
 }
 function preexec {
     # change terminal title to show command
@@ -177,10 +166,20 @@ case "$OSTYPE"; in
     *)
         ## sound
         # TODO: test alsa/oss/sndio/portaudio/pulse in order of importance
+        function s() {}
 esac
 
+### modules & styles
+## vcs
+autoload -Uz vcs_info
+zstyle ':vcs_info:*' enable git
+#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
+
+## compinit
 # The following lines were added by compinstall
-zstyle ':completion:*' auto-description 'specify: %d'
+zstyle ':completion:*' auto-description '[arg] %d'
 zstyle ':completion:*' expand suffix
 zstyle ':completion:*' format '# %d'
 zstyle ':completion:*' group-name ''
@@ -200,4 +199,9 @@ autoload -Uz compinit
 compinit
 # End of lines added by compinstall
 
-# vim: ts=8:sts=4:sw=4:et:tw=79
+## prompt
+# do this last so prompt can potentially override
+autoload -Uz promptinit && promptinit
+prompt ds6
+
+# vim: set et sts=4 sw=4 ts=8 tw=79 :