From 2480144b4f274ce798b7dd811ba48e03d833eae8 Mon Sep 17 00:00:00 2001
From: Alpha Chen <alpha@kejadlen.dev>
Date: Mon, 3 Apr 2023 20:41:01 -0700
Subject: [PATCH] use fzf-git.sh

---
 runcoms/zshrc | 86 +++------------------------------------------------
 1 file changed, 5 insertions(+), 81 deletions(-)

diff --git a/runcoms/zshrc b/runcoms/zshrc
index 34d813a..2444171 100644
--- a/runcoms/zshrc
+++ b/runcoms/zshrc
@@ -64,94 +64,18 @@ if [ $commands[fzf] ]; then
   source "/opt/homebrew/opt/fzf/shell/key-bindings.zsh"
 
   export FZF_DEFAULT_OPTS='--height 40% --layout=reverse --border'
-  export FZF_DEFAULT_COMMAND="fd --hidden --follow --type f"
+  export FZF_DEFAULT_COMMAND="fd --type f --strip-cwd-prefix --hidden --follow --exclude .git"
   export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
   export FZF_ALT_C_COMMAND="fd --type d"
-  # alias fzf=fzf-tmux
+  # alias fzf='fzf-tmux -p'
 
   # https://github.com/junegunn/fzf/issues/164#issuecomment-581837757
   bindkey "ç" fzf-cd-widget
 
-  # https://junegunn.kr/2016/07/fzf-git/
-  is_in_git_repo() {
-    git rev-parse HEAD > /dev/null 2>&1
-  }
-
-  fzf-down() {
-    fzf --height 50% --min-height 20 --border --bind ctrl-/:toggle-preview "$@"
-  }
-
-  # files
-  _gf() {
-    is_in_git_repo || return
-    git -c color.status=always status --short |
-    fzf-down -m --ansi --nth 2..,.. \
-      --preview '(git diff --color=always -- {-1} | sed 1,4d; cat {-1})' |
-    cut -c4- | sed 's/.* -> //'
-  }
-
-  # branches
-  _gg() {
-    is_in_git_repo || return
-    git branch -a --color=always | grep -v '/HEAD\s' | sort |
-    fzf-down --ansi --multi --tac --preview-window right:70% \
-      --preview 'git log --oneline --graph --date=short --color=always --pretty="format:%C(auto)%cd %h%d %s" $(sed s/^..// <<< {} | cut -d" " -f1)' |
-    sed 's/^..//' | cut -d' ' -f1 |
-    sed 's#^remotes/##'
-  }
-
-  # tags
-  _gt() {
-    is_in_git_repo || return
-    git tag --sort -version:refname |
-    fzf-down --multi --preview-window right:70% \
-      --preview 'git show --color=always {}'
-  }
+  source ~/.dotfiles/src/fzf-git.sh/fzf-git.sh
 
-  # history
-  _gh() {
-    is_in_git_repo || return
-    git log --date=short --format="%C(green)%C(bold)%cd %C(auto)%h%d %s (%an)" --graph --color=always |
-    fzf-down --ansi --no-sort --reverse --multi --bind 'ctrl-s:toggle-sort' \
-      --header 'Press CTRL-S to toggle sort' \
-      --preview 'grep -o "[a-f0-9]\{7,\}" <<< {} | xargs git show --color=always' |
-    grep -o "[a-f0-9]\{7,\}"
-  }
-
-  # remotes
-  _gr() {
-    is_in_git_repo || return
-    git remote -v | awk '{print $1 "\t" $2}' | uniq |
-    fzf-down --tac \
-      --preview 'git log --oneline --graph --date=short --pretty="format:%C(auto)%cd %h%d %s" {1}' |
-    cut -d$'\t' -f1
-  }
-
-  # stashes
-  _gs() {
-    is_in_git_repo || return
-    git stash list | fzf-down --reverse -d: --preview 'git show --color=always {1}' |
-    cut -d: -f1
-  }
-
-  join-lines() {
-    local item
-    while read item; do
-      echo -n "${(q)item} "
-    done
-  }
-
-  bind-git-helper() {
-    local c
-    for c in $@; do
-      eval "fzf-g$c-widget() { local result=\$(_g$c | join-lines); zle reset-prompt; LBUFFER+=\$result }"
-      eval "zle -N fzf-g$c-widget"
-      eval "bindkey '^g$c' fzf-g$c-widget"  # So it works in tmux
-      eval "bindkey '^g^$c' fzf-g$c-widget"
-    done
-  }
-  bind-git-helper f g t r h s
-  unset -f bind-git-helper
+  # ^gb is eaten by tmux
+  eval "bindkey '^gg' fzf-git-branches-widget"
 
   # https://github.com/skywind3000/z.lua/wiki/Effective-with-fzf#define-a-new-z--i
   zlua_fzf() {