X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/d1802b02439cc2b5c082f6b03bea57b97dd76862..db8700bf737bc8a2325036f8d4e8a51745f421c7:/base/.zshrc

diff --git a/base/.zshrc b/base/.zshrc
index 2486de7..6cbdfe0 100644
--- a/base/.zshrc
+++ b/base/.zshrc
@@ -1,5 +1,8 @@
+### user-local fpath
+fpath=(~/.zsh ~/.zsh/functions/Prompts "${fpath[@]}")
+
 ### options
-setopt autocd extendedglob
+setopt autocd extendedglob promptsubst
 unsetopt beep
 
 ### history
@@ -19,20 +22,48 @@ 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 ll="ls -lAFho"
+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="ps -aSdxwwouser=USR -ogroup=GRP -opid,nice=N \
-         -o%cpu,%mem,tt,stat,start=START -oetime,command | ${PAGER:-more} -Se"
+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 \
+       -o%cpu,%mem,tty,stat,start=START -oetime,command"
+} elif [[ "$(readlink -f $(which ps))" =~ "/busybox" ]] {
+    # busybox compatible
+    p="ps -eouser='USR     ' -ogroup='GRP     ' \
+       -opid='  PID' -onice=' NI' -ovsz=' MEM' \
+       -otty,stat,etime,comm"
+} else {
+    # XXX: untested, posix
+    # TODO: support gnu ps
+    p="ps -eouser=USR -ogroup=GRP -opid,nice=NI \
+       -opcpu=CPU -ovsz=MEM -otty,stat,etime,comm"
+}
+p="$p | ${PAGER:-more} -Se"
 alias pa="$p"
 alias spa="sudo $p"
 unset p
@@ -46,60 +77,34 @@ if [[ "$OSTYPE" =~ '^freebsd' ]] {
     # don't confirm if only a few files are deleted
     alias rm='rm -I'
 } else {
+    # TODO: similar behavior for non-freebsd, or impliment in zsh
     alias rm='rm -i'
 }
-
-### prompt
-setopt prompt_subst
-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
     print -Pnf "\e]2;%s\e\\" "%#${SSH_CLIENT+$USER@$HOST:}$1"
     # save last exec time for bell
+    # XXX: does not run for blank cmdline
     _exectime=$SECONDS
 }
 function chpwd {
+    # echo dir on cwd change
     l
 }
 
@@ -150,10 +155,23 @@ case "$OSTYPE"; in
             }
             mixerctl -w outputs.master"$2"="$1"
         };;
+    *)
+        ## 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 ''
@@ -173,4 +191,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 :