AutoYADM commit: 2024-12-16 16:35:05

.config/zsh/fzf-git.sh

@@ -0,0 +1,331 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2024 Junegunn Choi
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# shellcheck disable=SC2039
+[[ $0 = - ]] && return
+
+__fzf_git_color() {
+  if [[ -n $NO_COLOR ]]; then
+    echo never
+  elif [[ $# -gt 0 ]] && [[ -n $FZF_GIT_PREVIEW_COLOR ]]; then
+    echo "$FZF_GIT_PREVIEW_COLOR"
+  else
+    echo "${FZF_GIT_COLOR:-always}"
+  fi
+}
+
+__fzf_git_cat() {
+  if [[ -n $FZF_GIT_CAT ]]; then
+    echo "$FZF_GIT_CAT"
+    return
+  fi
+
+  # Sometimes bat is installed as batcat
+  _fzf_git_bat_options="--style='${BAT_STYLE:-full}' --color=$(__fzf_git_color .) --pager=never"
+  if command -v batcat > /dev/null; then
+    echo "batcat $_fzf_git_bat_options"
+  elif command -v bat > /dev/null; then
+    echo "bat $_fzf_git_bat_options"
+  else
+    echo cat
+  fi
+}
+
+__fzf_git_pager() {
+  local pager
+  pager="${FZF_GIT_PAGER:-${GIT_PAGER:-$(git config --get core.pager 2>/dev/null)}}"
+  echo "${pager:-cat}"
+}
+
+if [[ $1 = --list ]]; then
+  shift
+  if [[ $# -eq 1 ]]; then
+    branches() {
+      git branch "$@" --sort=-committerdate --sort=-HEAD --format=$'%(HEAD) %(color:yellow)%(refname:short) %(color:green)(%(committerdate:relative))\t%(color:blue)%(subject)%(color:reset)' --color=$(__fzf_git_color) | column -ts$'\t'
+    }
+    refs() {
+      git for-each-ref "$@" --sort=-creatordate --sort=-HEAD --color=$(__fzf_git_color) --format=$'%(if:equals=refs/remotes)%(refname:rstrip=-2)%(then)%(color:magenta)remote-branch%(else)%(if:equals=refs/heads)%(refname:rstrip=-2)%(then)%(color:brightgreen)branch%(else)%(if:equals=refs/tags)%(refname:rstrip=-2)%(then)%(color:brightcyan)tag%(else)%(if:equals=refs/stash)%(refname:rstrip=-2)%(then)%(color:brightred)stash%(else)%(color:white)%(refname:rstrip=-2)%(end)%(end)%(end)%(end)\t%(color:yellow)%(refname:short) %(color:green)(%(creatordate:relative))\t%(color:blue)%(subject)%(color:reset)' | column -ts$'\t'
+    }
+    hashes() {
+      git log --date=short --format="%C(green)%C(bold)%cd %C(auto)%h%d %s (%an)" --graph --color=$(__fzf_git_color) "$@"
+    }
+    case "$1" in
+      branches)
+        echo $'CTRL-O (open in browser) ╱ ALT-A (show all branches)\n'
+        branches
+        ;;
+      all-branches)
+        echo $'CTRL-O (open in browser)\n'
+        branches -a
+        ;;
+      hashes)
+        echo $'CTRL-O (open in browser) ╱ CTRL-D (diff)\nCTRL-S (toggle sort) ╱ ALT-A (show all hashes)\n'
+        hashes
+        ;;
+      all-hashes)
+        echo $'CTRL-O (open in browser) ╱ CTRL-D (diff)\nCTRL-S (toggle sort)\n'
+        hashes --all
+        ;;
+      refs)
+        echo $'CTRL-O (open in browser) ╱ ALT-E (examine in editor) ╱ ALT-A (show all refs)\n'
+        refs --exclude='refs/remotes'
+        ;;
+      all-refs)
+        echo $'CTRL-O (open in browser) ╱ ALT-E (examine in editor)\n'
+        refs
+        ;;
+      *) exit 1 ;;
+    esac
+  elif [[ $# -gt 1 ]]; then
+    set -e
+
+    branch=$(git rev-parse --abbrev-ref HEAD 2> /dev/null)
+    if [[ $branch = HEAD ]]; then
+      branch=$(git describe --exact-match --tags 2> /dev/null || git rev-parse --short HEAD)
+    fi
+
+    # Only supports GitHub for now
+    case "$1" in
+      commit)
+        hash=$(grep -o "[a-f0-9]\{7,\}" <<< "$2")
+        path=/commit/$hash
+        ;;
+      branch|remote-branch)
+        branch=$(sed 's/^[* ]*//' <<< "$2" | cut -d' ' -f1)
+        remote=$(git config branch."${branch}".remote || echo 'origin')
+        branch=${branch#$remote/}
+        path=/tree/$branch
+        ;;
+      remote)
+        remote=$2
+        path=/tree/$branch
+        ;;
+      file) path=/blob/$branch/$(git rev-parse --show-prefix)$2 ;;
+      tag)  path=/releases/tag/$2 ;;
+      *)    exit 1 ;;
+    esac
+
+    remote=${remote:-$(git config branch."${branch}".remote || echo 'origin')}
+    remote_url=$(git remote get-url "$remote" 2> /dev/null || echo "$remote")
+
+    if [[ $remote_url =~ ^git@ ]]; then
+      url=${remote_url%.git}
+      url=${url#git@}
+      url=https://${url/://}
+    elif [[ $remote_url =~ ^http ]]; then
+      url=${remote_url%.git}
+    fi
+
+    case "$(uname -s)" in
+      Darwin) open "$url$path"     ;;
+      *)      xdg-open "$url$path" ;;
+    esac
+    exit 0
+  fi
+fi
+
+if [[ $- =~ i ]]; then
+# -----------------------------------------------------------------------------
+
+# Redefine this function to change the options
+_fzf_git_fzf() {
+  fzf --height=50% --tmux 90%,70% \
+    --layout=reverse --multi --min-height=20 --border \
+    --border-label-pos=2 \
+    --color='header:italic:underline,label:blue' \
+    --preview-window='right,50%,border-left' \
+    --bind='ctrl-/:change-preview-window(down,50%,border-top|hidden|)' "$@"
+}
+
+_fzf_git_check() {
+  git rev-parse HEAD > /dev/null 2>&1 && return
+
+  [[ -n $TMUX ]] && tmux display-message "Not in a git repository"
+  return 1
+}
+
+__fzf_git=${BASH_SOURCE[0]:-${(%):-%x}}
+__fzf_git=$(readlink -f "$__fzf_git" 2> /dev/null || /usr/bin/ruby --disable-gems -e 'puts File.expand_path(ARGV.first)' "$__fzf_git" 2> /dev/null)
+
+_fzf_git_files() {
+  _fzf_git_check || return
+  local root query
+  root=$(git rev-parse --show-toplevel)
+  [[ $root != "$PWD" ]] && query='!../ '
+
+  (git -c color.status=$(__fzf_git_color) status --short --no-branch
+   git ls-files "$root" | grep -vxFf <(git status -s | grep '^[^?]' | cut -c4-; echo :) | sed 's/^/   /') |
+  _fzf_git_fzf -m --ansi --nth 2..,.. \
+    --border-label '📁 Files' \
+    --header $'CTRL-O (open in browser) ╱ ALT-E (open in editor)\n\n' \
+    --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list file {-1}" \
+    --bind "alt-e:execute:${EDITOR:-vim} {-1} > /dev/tty" \
+    --query "$query" \
+    --preview "git diff --no-ext-diff --color=$(__fzf_git_color .) -- {-1} | $(__fzf_git_pager); $(__fzf_git_cat) {-1}" "$@" |
+  cut -c4- | sed 's/.* -> //'
+}
+
+_fzf_git_branches() {
+  _fzf_git_check || return
+  bash "$__fzf_git" --list branches |
+  _fzf_git_fzf --ansi \
+    --border-label '🌲 Branches' \
+    --header-lines 2 \
+    --tiebreak begin \
+    --preview-window down,border-top,40% \
+    --color hl:underline,hl+:underline \
+    --no-hscroll \
+    --bind 'ctrl-/:change-preview-window(down,70%|hidden|)' \
+    --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list branch {}" \
+    --bind "alt-a:change-border-label(🌳 All branches)+reload:bash \"$__fzf_git\" --list all-branches" \
+    --preview "git log --oneline --graph --date=short --color=$(__fzf_git_color .) --pretty='format:%C(auto)%cd %h%d %s' \$(sed s/^..// <<< {} | cut -d' ' -f1) --" "$@" |
+  sed 's/^..//' | cut -d' ' -f1
+}
+
+_fzf_git_tags() {
+  _fzf_git_check || return
+  git tag --sort -version:refname |
+  _fzf_git_fzf --preview-window right,70% \
+    --border-label '📛 Tags' \
+    --header $'CTRL-O (open in browser)\n\n' \
+    --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list tag {}" \
+    --preview "git show --color=$(__fzf_git_color .) {} | $(__fzf_git_pager)" "$@"
+}
+
+_fzf_git_hashes() {
+  _fzf_git_check || return
+  bash "$__fzf_git" --list hashes |
+  _fzf_git_fzf --ansi --no-sort --bind 'ctrl-s:toggle-sort' \
+    --border-label '🍡 Hashes' \
+    --header-lines 3 \
+    --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list commit {}" \
+    --bind "ctrl-d:execute:grep -o '[a-f0-9]\{7,\}' <<< {} | head -n 1 | xargs git diff --color=$(__fzf_git_color) > /dev/tty" \
+    --bind "alt-a:change-border-label(🍇 All hashes)+reload:bash \"$__fzf_git\" --list all-hashes" \
+    --color hl:underline,hl+:underline \
+    --preview "grep -o '[a-f0-9]\{7,\}' <<< {} | head -n 1 | xargs git show --color=$(__fzf_git_color .) | $(__fzf_git_pager)" "$@" |
+  awk 'match($0, /[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]*/) { print substr($0, RSTART, RLENGTH) }'
+}
+
+_fzf_git_remotes() {
+  _fzf_git_check || return
+  git remote -v | awk '{print $1 "\t" $2}' | uniq |
+  _fzf_git_fzf --tac \
+    --border-label '📡 Remotes' \
+    --header $'CTRL-O (open in browser)\n\n' \
+    --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list remote {1}" \
+    --preview-window right,70% \
+    --preview "git log --oneline --graph --date=short --color=$(__fzf_git_color .) --pretty='format:%C(auto)%cd %h%d %s' '{1}/$(git rev-parse --abbrev-ref HEAD)' --" "$@" |
+  cut -d$'\t' -f1
+}
+
+_fzf_git_stashes() {
+  _fzf_git_check || return
+  git stash list | _fzf_git_fzf \
+    --border-label '🥡 Stashes' \
+    --header $'CTRL-X (drop stash)\n\n' \
+    --bind 'ctrl-x:reload(git stash drop -q {1}; git stash list)' \
+    -d: --preview "git show --color=$(__fzf_git_color .) {1} | $(__fzf_git_pager)" "$@" |
+  cut -d: -f1
+}
+
+_fzf_git_lreflogs() {
+  _fzf_git_check || return
+  git reflog --color=$(__fzf_git_color) --format="%C(blue)%gD %C(yellow)%h%C(auto)%d %gs" | _fzf_git_fzf --ansi \
+    --border-label '📒 Reflogs' \
+    --preview "git show --color=$(__fzf_git_color .) {1} | $(__fzf_git_pager)" "$@" |
+  awk '{print $1}'
+}
+
+_fzf_git_each_ref() {
+  _fzf_git_check || return
+  bash "$__fzf_git" --list refs | _fzf_git_fzf --ansi \
+    --nth 2,2.. \
+    --tiebreak begin \
+    --border-label '☘️  Each ref' \
+    --header-lines 2 \
+    --preview-window down,border-top,40% \
+    --color hl:underline,hl+:underline \
+    --no-hscroll \
+    --bind 'ctrl-/:change-preview-window(down,70%|hidden|)' \
+    --bind "ctrl-o:execute-silent:bash \"$__fzf_git\" --list {1} {2}" \
+    --bind "alt-e:execute:${EDITOR:-vim} <(git show {2}) > /dev/tty" \
+    --bind "alt-a:change-border-label(🍀 Every ref)+reload:bash \"$__fzf_git\" --list all-refs" \
+    --preview "git log --oneline --graph --date=short --color=$(__fzf_git_color .) --pretty='format:%C(auto)%cd %h%d %s' {2} --" "$@" |
+  awk '{print $2}'
+}
+
+_fzf_git_worktrees() {
+  _fzf_git_check || return
+  git worktree list | _fzf_git_fzf \
+    --border-label '🌴 Worktrees' \
+    --header $'CTRL-X (remove worktree)\n\n' \
+    --bind 'ctrl-x:reload(git worktree remove {1} > /dev/null; git worktree list)' \
+    --preview "
+      git -c color.status=$(__fzf_git_color .) -C {1} status --short --branch
+      echo
+      git log --oneline --graph --date=short --color=$(__fzf_git_color .) --pretty='format:%C(auto)%cd %h%d %s' {2} --
+    " "$@" |
+  awk '{print $1}'
+}
+
+if [[ -n "${BASH_VERSION:-}" ]]; then
+  __fzf_git_init() {
+    bind -m emacs-standard '"\er":  redraw-current-line'
+    bind -m emacs-standard '"\C-z": vi-editing-mode'
+    bind -m vi-command     '"\C-z": emacs-editing-mode'
+    bind -m vi-insert      '"\C-z": emacs-editing-mode'
+
+    local o c
+    for o in "$@"; do
+      c=${o:0:1}
+      bind -m emacs-standard '"\C-g\C-'$c'": " \C-u \C-a\C-k`_fzf_git_'$o'`\e\C-e\C-y\C-a\C-y\ey\C-h\C-e\er \C-h"'
+      bind -m vi-command     '"\C-g\C-'$c'": "\C-z\C-g\C-'$c'\C-z"'
+      bind -m vi-insert      '"\C-g\C-'$c'": "\C-z\C-g\C-'$c'\C-z"'
+      bind -m emacs-standard '"\C-g'$c'":    " \C-u \C-a\C-k`_fzf_git_'$o'`\e\C-e\C-y\C-a\C-y\ey\C-h\C-e\er \C-h"'
+      bind -m vi-command     '"\C-g'$c'":    "\C-z\C-g'$c'\C-z"'
+      bind -m vi-insert      '"\C-g'$c'":    "\C-z\C-g'$c'\C-z"'
+    done
+  }
+elif [[ -n "${ZSH_VERSION:-}" ]]; then
+  __fzf_git_join() {
+    local item
+    while read item; do
+      echo -n "${(q)item} "
+    done
+  }
+
+  __fzf_git_init() {
+    local m o
+    for o in "$@"; do
+      eval "fzf-git-$o-widget() { local result=\$(_fzf_git_$o | __fzf_git_join); zle reset-prompt; LBUFFER+=\$result }"
+      eval "zle -N fzf-git-$o-widget"
+      for m in emacs vicmd viins; do
+        eval "bindkey -M $m '^g^${o[1]}' fzf-git-$o-widget"
+        eval "bindkey -M $m '^g${o[1]}' fzf-git-$o-widget"
+      done
+    done
+  }
+fi
+__fzf_git_init files branches tags remotes hashes stashes lreflogs each_ref worktrees
+
+# -----------------------------------------------------------------------------
+fi

.config/zsh/fzf.zsh

@@ -9,5 +9,7 @@ export FZF_TMUX_OPTS=" -p90%,70% "
 
 export FZF_CTRL_T_OPTS="--preview 'bat --color=always -n --line-range :500 {}'"
 export FZF_ALT_C_OPTS="--preview 'eza --tree --color=always {} | head -200'"
+source ~/.config/zsh/fzf-git.sh
 
 alias fman="compgen -c | fzf | xargs man"
+alias nzo="~/.config/zsh/zoxide-nvim.sh"

.config/zsh/zoxide-nvim.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# Script to find every single file and opens in neovim
+# alias set as nzo in .zshrc
+search_with_zoxdie() {
+  if [ -z "$1" ]; then
+    # use fd with fzf to select & open a file when no arg are provided
+    file="$(fd --type f -I -H -E .git -E .git-crypt -E .cache -E .backup | fzf --height=70% --preview='bat -n --color=always --line-range :500 {}')"
+    if [ -n "$file" ]; then
+      nvim "$file"
+    fi
+  else
+    # Handle when an arg is provided
+    lines=$(zoxide query -l | xargs -I {} fd --type f -I -H -E .git -E .git-crypt -E .cache -E .backup -E .vscode "$1" {} | fzf --no-sort) # Initial filter attempt with fzf
+    line_count="$(echo "$lines" | wc -l | xargs)"                                                                                          # Trim any leading spaces
+
+    if [ -n "$lines" ] && [ "$line_count" -eq 1 ]; then
+      # looks for the exact ones and opens it
+      file="$lines"
+      nvim "$file"
+    elif [ -n "$lines" ]; then
+      # If multiple files are found, allow further selection using fzf and bat for preview
+      file=$(echo "$lines" | fzf --query="$1" --height=70% --preview='bat -n --color=always --line-range :500 {}')
+      if [ -n "$file" ]; then
+        nvim "$file"
+      fi
+    else
+      echo "No matches found." >&2
+    fi
+  fi
+}
+
+search_with_zoxdie "$@"

.zshrc

@@ -23,10 +23,10 @@ bindkey "^e" edit-command-line
 # Set up fzf key bindings and fuzzy completion
 source ~/.config/zsh/fzf.zsh
 # Not working for some reason...
-source ~/.config/zsh/fzf-git.sh
+# source ~/.config/zsh/fzf-git.sh
 
 # alias ls="eza -lh --git"
-alias ls="eza --long --git --header --icons"
+alias ls="eza --long --color=always --git --header --icons --no-user"
 alias c="clear"
 alias top=btop
 alias minvim='NVIM_APPNAME="nvim-min" nvim'