zlogout: clean up logic, dont act without data

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

diff --git a/etc/zsh/.zshrc b/etc/zsh/.zshrc
index ab3d7ef2ee738ed0c44099e614132b23f047a4fc..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'


@@ -276,14 +290,21 @@ alias svu="sudo python3 -mvenv --upgrade"
 alias g=git
 alias gd='git diff'
 alias gdh='git diff HEAD'
 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}})


@@ -401,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