zlogout: clean up logic, dont act without data

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

diff --git a/etc/zsh/.zshrc b/etc/zsh/.zshrc
index 4a5a2522c9fbdbbffab9fba7f122bd0fa410efcc..893cac58c9b02faa60c9adc61db9f6614bbbe68b 100644 (file)
--- a/etc/zsh/.zshrc
+++ b/etc/zsh/.zshrc
@@ -200,6 +200,20 @@ for k v (${(kv)a}) {
 }
 unset a k v
 
 }
 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'
 ### aliases
 ## builtins
 alias rehash='_sev_setpath; rehash'


@@ -215,9 +229,18 @@ if [[ "$OSTYPE" =~ '^(free|net)bsd' ]] {
 alias p=\$PAGER
 alias e=\$EDITOR
 alias se=sudoedit
 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'
 # be paranoid
 alias cp='cp -ip'
 alias mv='mv -i'

+# zsh zmv with noglob wildcards

 alias zm='noglob zmv -WiM'
 alias zc='noglob zmv -WiC'
 alias zl='noglob zmv -WiL'
 alias zm='noglob zmv -WiM'
 alias zc='noglob zmv -WiC'
 alias zl='noglob zmv -WiL'


@@ -232,29 +255,24 @@ if [[ "$OSTYPE" =~ '^freebsd' ]] {
     alias rm='rm -i'
 }
 [[ -v commands[trash-put] ]] && alias t=trash-put
     alias rm='rm -i'
 }
 [[ -v commands[trash-put] ]] && alias t=trash-put

-## py venv
-alias va='source bin/activate'
-alias vd=deactivate
-## ps
-source ~/.local/bin/.check-busybox
-if [[ -v commands[pstree] ]] && ! check-busybox pstree; then
+# ps
+if [[ -v commands[pstree] && $commands[pstree]:A:t != busybox ]] {

     # use pstree, but NOT busybox pstree because it kinda sucks
     # 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"
     # 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
     # 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 {
 if [[ "$(basename "$PAGER")" = "less" ]] {
     ps="$ps | less -S"
 } else {


@@ -263,18 +281,30 @@ if [[ "$(basename "$PAGER")" = "less" ]] {
 alias pa=$ps
 alias spa="sudo $ps"
 unset ps
 alias pa=$ps
 alias spa="sudo $ps"
 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'
 ## git
 alias g=git
 alias gd='git diff'
 alias gdh='git diff HEAD'

+alias gds='git diff --staged'

 alias ga='git add'
 alias ga.='git add .'
 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 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 gst='git status'
+alias gs='git stash'
+alias gsp='git stash pop'

 ## cd/zoxide
 function up {
     \cd $(printf '../%.0s' {1..${1:-1}})
 ## cd/zoxide
 function up {
     \cd $(printf '../%.0s' {1..${1:-1}})


@@ -287,16 +317,26 @@ if [[ -v commands[zoxide] ]] {
 }
 alias cd..=up
 ## dotfiles
 }
 alias cd..=up
 ## dotfiles

-alias dfu='d=${$(echo -E - ~/.zshenv):P:h:h};GIT_DIR=$d/.git GIT_WORK_TREE=$d {
-  git pull &&
-  git submodules init &&
-  git submodules sync &&
-  git submodules update
+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
+alias sudo='nocorrect sudo'
+## docker compose
+alias dcp='sudo docker compose pull'
+alias dcu='sudo docker compose up -d'
+alias dcr='sudo docker compose restart'
+alias dcl='sudo docker compose logs -f'

 
 ### hooks
 autoload -Uz add-zsh-hook
 
 ### 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\\"
 function sev_preexec {
     # change terminal title to show command
     print -n "\e]2;$(print -P '%#')${SSH_CLIENT+$USER@$HOST:}$1\e\\"


@@ -382,5 +422,8 @@ esac
 autoload -Uz promptinit && promptinit
 prompt arrows
 
 autoload -Uz promptinit && promptinit
 prompt arrows
 

+### plugins
+load-plugins zshrc
+

 ### load site-specific
 load-site-dotfile zshrc
 ### load site-specific
 load-site-dotfile zshrc