summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xnav20
-rwxr-xr-xseek21
2 files changed, 28 insertions, 13 deletions
diff --git a/nav b/nav
index 7984656..d55ced8 100755
--- a/nav
+++ b/nav
@@ -1,19 +1,21 @@
cat \
- <(echo "edit: enter") \
- <(echo "prnt: alt-enter") \
- <(echo "prev: alt-0..1") \
- <(echo "pgup: scroll up") \
- <(echo "pgdn: scroll down") \
+ <(echo "edit: enter | prnt: alt-enter | view: alt-0..6 | pgup/pgdn: scroll") \
<(fd --exclude=_ -t f . $PWD | sed "s,$PWD/*,,g") \
- | fzf-tmux \
+ | fzf \
--bind "alt-enter:accept" \
--bind "enter:execute(vim {})" \
--bind "ctrl-/:change-preview-window(88|hidden|)" \
- --bind "alt-0:change-preview(cat {})" \
+ --bind "alt-0:change-preview(bat -p --color always {})" \
--bind "alt-1:change-preview(git log --color=always --date=relative --abbrev-commit --pretty=format:'%Cred%h%Creset %s / %an %Creset%C(yellow)%d%Creset%Cgreen(%cr)%Creset' -- {})" \
+ --bind "alt-2:change-preview(git log --color=always {})" \
+ --bind "alt-3:change-preview(git log --color=always -p {})" \
+ --bind "alt-4:change-preview(git blame -c --date=short {})" \
+ --bind "alt-5:change-preview(git log --pretty=short {} | git shortlog -nse)" \
+ --bind "alt-6:change-preview(git log --pretty=short {} | git shortlog)" \
--bind "pgup:preview-page-up" \
--bind "pgdn:preview-page-down" \
- --header-lines=5 \
+ --bind "backward-eof:abort" \
+ --header-lines=1 \
--header-first \
--preview-window="border-sharp,88" \
- --preview "cat {}"
+ --preview "bat -p --color always {}"
diff --git a/seek b/seek
index 91b8773..317fb49 100755
--- a/seek
+++ b/seek
@@ -1,13 +1,26 @@
#!/usr/bin/env bash
set -euo pipefail
-RG="rg --ignore-case --files-with-matches $*"
-readarray -t selected <<< "$(fzf-tmux \
- -p "70%" \
+RG_DEFAULT_COMMAND="rg --ignore-case --files-with-matches $*"
+INITIAL_QUERY=""
+readarray -t selected <<< "$(fzf \
--multi \
--exact \
--ansi \
+ --disabled \
+ --query "$INITIAL_QUERY" \
--bind "ctrl-a:select-all" \
- --bind "change:reload:$RG {q} || true" \
+ --bind "alt-0:change-preview:rg --ignore-case --pretty --context 2 {q} {}" \
+ --bind "alt-1:change-preview(bat -p --color always {})" \
+ --bind "alt-2:change-preview(git log --color=always --date=relative --abbrev-commit --pretty=format:'%Cred%h%Creset %s / %an %Creset%C(yellow)%d%Creset%Cgreen(%cr)%Creset' -- {})" \
+ --bind "alt-3:change-preview(git log --color=always {})" \
+ --bind "alt-4:change-preview(git log --color=always -p {})" \
+ --bind "alt-5:change-preview(git blame -c --date=short {})" \
+ --bind "alt-6:change-preview(git log --pretty=short {} | git shortlog -nse)" \
+ --bind "alt-7:change-preview(git log --pretty=short {} | git shortlog)" \
+ --bind "pgup:preview-page-up" \
+ --bind "pgdn:preview-page-down" \
+ --bind "backward-eof:abort" \
+ --bind "change:reload:$RG_DEFAULT_COMMAND {q} || true" \
--print-query \
--preview "rg --ignore-case --pretty --context 2 {q} {}" \
--preview-window down