zshrc: catch zkbd errors and continue

[dotfiles.git] / etc / zsh / .zshrc

diff --git a/etc/zsh/.zshrc b/etc/zsh/.zshrc
index fd1f3788652c4057bb95d9e6fa50f02139924b24..85e3d643799b027485056962acef5be7a4477d06 100644 (file)
--- a/etc/zsh/.zshrc
+++ b/etc/zsh/.zshrc
@@ -10,8 +10,9 @@ setopts=(
   ## 16.2.4  History
   # NOTE: NO_HIST_SAVE_BY_COPY to allow saving histfile if updating another
   #       user's histfile. this is for compatibility with zsu.
-  HIST_FCNTL_LOCK HIST_IGNORE_DUPS HIST_IGNORE_SPACE HIST_LEX_WORDS
-  HIST_NO_STORE HIST_REDUCE_BLANKS NO_HIST_SAVE_BY_COPY SHARE_HISTORY
+  EXTENDED_HISTORY HIST_FCNTL_LOCK HIST_IGNORE_ALL_DUPS HIST_IGNORE_DUPS
+  HIST_IGNORE_SPACE HIST_LEX_WORDS HIST_NO_STORE HIST_REDUCE_BLANKS
+  NO_HIST_SAVE_BY_COPY HIST_SAVE_NO_DUPS SHARE_HISTORY
   ## 16.2.6  Input/Output
   NO_CLOBBER CLOBBER_EMPTY CORRECT_ALL INTERACTIVE_COMMENTS
   HASH_EXECUTABLES_ONLY
@@ -142,12 +143,16 @@ if [[ ! -v _sev_force_zkbd && ( -v terminfo || -v termcap ) ]] {
     }
     find_keymap
     if [[ -z $keymap ]] {
-        if read -q "?Can't read terminfo. Add new zkbd keymap? [y/N]"; then
+        if (read -q "?Can't read terminfo. Add new zkbd keymap? [y/N]") {
             echo
-            autoload -Uz zkbd && zkbd
-            unfunction zkbd
+            {
+                autoload -Uz zkbd && zkbd
+            } always {
+                TRY_BLOCK_ERROR=0
+                unfunction zkbd
+            }
             find_keymap
-        fi
+        }
         echo
     }
     if [[ -n $keymap ]] {
@@ -200,6 +205,20 @@ for k v (${(kv)a}) {
 }
 unset a k v
 
+## fzf
+# bash-style reverse-search-history (i.e. reverse-i-search)
+if [[ -v commands[fzf] ]] {
+    function _history-incremental-pattern-search-fzf {
+        l=(${(f)"$(fc -li -1 0 | fzf -e -m -n 1 +s --preview-window=hidden ${BUFFER:+-q $BUFFER})"})
+        l=$(for x ("${l[@]}") { echo ${${=x}:3}; })
+        BUFFER="$l"
+    }
+    zle -N _history-incremental-pattern-search-fzf
+    bindkey '^R' _history-incremental-pattern-search-fzf
+} else {
+    bindkey '^R' history-incremental-pattern-search-backward
+}
+
 ### aliases
 ## builtins
 alias rehash='_sev_setpath; rehash'
@@ -215,6 +234,14 @@ if [[ "$OSTYPE" =~ '^(free|net)bsd' ]] {
 alias p=\$PAGER
 alias e=\$EDITOR
 alias se=sudoedit
+alias syncwatch='sync & watch -d grep -Fe Dirty: -e Writeback: /proc/meminfo'
+if [[ -v commands[grep] ]] {
+    [[ -v commands[fgrep] ]] || alias fgrep='grep -F'
+    [[ -v commands[egrep] ]] || alias fgrep='grep -E'
+}
+for x (cat cmp diff grep test update) {
+    [[ -v commands[zutils-z$x] ]] || alias z$x=zutils-z$x
+}
 # be paranoid
 alias cp='cp -ip'
 alias mv='mv -i'
@@ -234,25 +261,23 @@ if [[ "$OSTYPE" =~ '^freebsd' ]] {
 }
 [[ -v commands[trash-put] ]] && alias t=trash-put
 # ps
-source ~/.local/bin/.check-busybox
-if [[ -v commands[pstree] ]] && ! check-busybox pstree; then
+if [[ -v commands[pstree] && $commands[pstree]:A:t != busybox ]] {
     # use pstree, but NOT busybox pstree because it kinda sucks
-    ps="pstree -wg3"
-elif [[ "$OSTYPE" =~ '^freebsd' ]]; then
-    ps="ps -aSdfxwwouser=USR -ogroup=GRP -opid,nice=NI \
-       -o%cpu,%mem,tty,stat,start=START -oetime,command"
-elif check-busybox ps; then
+    ps='pstree -wg3'
+} elif [[ "$OSTYPE" =~ '^freebsd' ]] {
+    ps='ps -aSdfxwwouser=USR -ogroup=GRP -opid,nice=NI \
+       -o%cpu,%mem,tty,stat,start=START -oetime,command'
+} elif [[ $commands[ps]:A:t == busybox ]] {
     # busybox compatible
     ps="ps -eouser='USR     ' -ogroup='GRP     ' \
        -opid='  PID' -onice=' NI' -ovsz=' MEM' \
        -otty,stat,etime,comm"
-else
+} else {
     # XXX: untested, posix
     # TODO: support gnu ps
-    ps="ps -eouser=USR -ogroup=GRP -opid,nice=NI \
-       -opcpu=CPU -ovsz=MEM -otty,stat,etime,comm"
-fi
-unfunction check-busybox
+    ps='ps -eouser=USR -ogroup=GRP -opid,nice=NI \
+       -opcpu=CPU -ovsz=MEM -otty,stat,etime,comm'
+}
 if [[ "$(basename "$PAGER")" = "less" ]] {
     ps="$ps | less -S"
 } else {
@@ -264,18 +289,31 @@ unset ps
 ## py venv
 alias va='source bin/activate'
 alias vd=deactivate
+alias vu="python3 -mvenv --upgrade"
+alias svu="sudo python3 -mvenv --upgrade"
 ## git
 alias g=git
 alias gd='git diff'
 alias gdh='git diff HEAD'
+alias gdp='git diff HEAD\^'
+alias gds='git diff --staged'
 alias ga='git add'
 alias ga.='git add .'
+alias gai='git add -i'
+alias gap='git add -p'
 alias gc='git commit'
 alias gca='git commit --amend'
 alias gp='git push'
 alias gu='git pull'
 alias gl='git log'
 alias gt='git tree' # from gitconfig
+alias gsh='git show'
+alias gshn='git show --name-status'
+alias gst='git status'
+alias gsts='git status --short'
+alias gs='git stash'
+alias gsp='git stash pop'
+alias grc='git rebase --continue'
 ## cd/zoxide
 function up {
     \cd $(printf '../%.0s' {1..${1:-1}})
@@ -285,16 +323,17 @@ if [[ -v commands[zoxide] ]] {
     # https://github.com/ajeetdsouza/zoxide/issues/513
     eval "${$(zoxide init zsh):s#_files -/#_cd#}"
     alias cd=z
+    alias z-='z -'
 }
 alias cd..=up
 ## dotfiles
-alias dfu=' function {
-    local d=${$(echo -E - ~/.zshenv):P:h:h}
-    local -x GIT_DIR=$d/.git GIT_WORK_TREE=$d
+alias dfu='function {
+    pushd -q ${$(echo -E - ~/.zshenv):P:h:h}
     git pull &&
     git submodule init &&
     git submodule sync &&
     git submodule update
+    popd -q
 }'
 ## nocorrect
 # zsh doesnt really handle sudo very well, so ignore it
@@ -307,7 +346,7 @@ alias dcl='sudo docker compose logs -f'
 
 ### hooks
 autoload -Uz add-zsh-hook
-_sev_exectime=
+typeset -gi _sev_exectime
 function sev_preexec {
     # change terminal title to show command
     print -n "\e]2;$(print -P '%#')${SSH_CLIENT+$USER@$HOST:}$1\e\\"
@@ -393,5 +432,8 @@ esac
 autoload -Uz promptinit && promptinit
 prompt arrows
 
+### plugins
+load-plugins zshrc
+
 ### load site-specific
 load-site-dotfile zshrc