Update dotfiles/.local/fzf-tmux.sh, dotfiles/.zshrc, dotfiles/.local/share/bash-completion/completions/nnn.bash
This commit is contained in:
Brian Zalewski
parent
4258fde668
commit
129718454c
3 changed files with 315 additions and 8 deletions
224
dotfiles/.local/fzf-tmux.sh
Normal file
224
dotfiles/.local/fzf-tmux.sh
Normal file
|
|
@ -0,0 +1,224 @@
|
|||
#!/usr/bin/env bash
|
||||
# fzf-tmux: starts fzf in a tmux pane
|
||||
# usage: fzf-tmux [LAYOUT OPTIONS] [--] [FZF OPTIONS]
|
||||
|
||||
fail() {
|
||||
>&2 echo "$1"
|
||||
exit 2
|
||||
}
|
||||
|
||||
fzf="$(command -v fzf 2> /dev/null)" || fzf="$(dirname "$0")/fzf"
|
||||
[[ -x "$fzf" ]] || fail 'fzf executable not found'
|
||||
|
||||
args=()
|
||||
opt=""
|
||||
skip=""
|
||||
swap=""
|
||||
close=""
|
||||
term=""
|
||||
[[ -n "$LINES" ]] && lines=$LINES || lines=$(tput lines) || lines=$(tmux display-message -p "#{pane_height}")
|
||||
[[ -n "$COLUMNS" ]] && columns=$COLUMNS || columns=$(tput cols) || columns=$(tmux display-message -p "#{pane_width}")
|
||||
|
||||
help() {
|
||||
>&2 echo 'usage: fzf-tmux [LAYOUT OPTIONS] [--] [FZF OPTIONS]
|
||||
LAYOUT OPTIONS:
|
||||
(default layout: -d 50%)
|
||||
Popup window (requires tmux 3.2 or above):
|
||||
-p [WIDTH[%][,HEIGHT[%]]] (default: 50%)
|
||||
-w WIDTH[%]
|
||||
-h HEIGHT[%]
|
||||
-x COL
|
||||
-y ROW
|
||||
Split pane:
|
||||
-u [HEIGHT[%]] Split above (up)
|
||||
-d [HEIGHT[%]] Split below (down)
|
||||
-l [WIDTH[%]] Split left
|
||||
-r [WIDTH[%]] Split right
|
||||
'
|
||||
exit
|
||||
}
|
||||
|
||||
while [[ $# -gt 0 ]]; do
|
||||
arg="$1"
|
||||
shift
|
||||
[[ -z "$skip" ]] && case "$arg" in
|
||||
-)
|
||||
term=1
|
||||
;;
|
||||
--help)
|
||||
help
|
||||
;;
|
||||
--version)
|
||||
echo "fzf-tmux (with fzf $("$fzf" --version))"
|
||||
exit
|
||||
;;
|
||||
-p*|-w*|-h*|-x*|-y*|-d*|-u*|-r*|-l*)
|
||||
if [[ "$arg" =~ ^-[pwhxy] ]]; then
|
||||
[[ "$opt" =~ "-E" ]] || opt="-E"
|
||||
elif [[ "$arg" =~ ^.[lr] ]]; then
|
||||
opt="-h"
|
||||
if [[ "$arg" =~ ^.l ]]; then
|
||||
opt="$opt -d"
|
||||
swap="; swap-pane -D ; select-pane -L"
|
||||
close="; tmux swap-pane -D"
|
||||
fi
|
||||
else
|
||||
opt=""
|
||||
if [[ "$arg" =~ ^.u ]]; then
|
||||
opt="$opt -d"
|
||||
swap="; swap-pane -D ; select-pane -U"
|
||||
close="; tmux swap-pane -D"
|
||||
fi
|
||||
fi
|
||||
if [[ ${#arg} -gt 2 ]]; then
|
||||
size="${arg:2}"
|
||||
else
|
||||
if [[ "$1" =~ ^[0-9%,]+$ ]] || [[ "$1" =~ ^[A-Z]$ ]]; then
|
||||
size="$1"
|
||||
shift
|
||||
else
|
||||
continue
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ "$arg" =~ ^-p ]]; then
|
||||
if [[ -n "$size" ]]; then
|
||||
w=${size%%,*}
|
||||
h=${size##*,}
|
||||
opt="$opt -w$w -h$h"
|
||||
fi
|
||||
elif [[ "$arg" =~ ^-[whxy] ]]; then
|
||||
opt="$opt ${arg:0:2}$size"
|
||||
elif [[ "$size" =~ %$ ]]; then
|
||||
size=${size:0:((${#size}-1))}
|
||||
if [[ -n "$swap" ]]; then
|
||||
opt="$opt -p $(( 100 - size ))"
|
||||
else
|
||||
opt="$opt -p $size"
|
||||
fi
|
||||
else
|
||||
if [[ -n "$swap" ]]; then
|
||||
if [[ "$arg" =~ ^.l ]]; then
|
||||
max=$columns
|
||||
else
|
||||
max=$lines
|
||||
fi
|
||||
size=$(( max - size ))
|
||||
[[ $size -lt 0 ]] && size=0
|
||||
opt="$opt -l $size"
|
||||
else
|
||||
opt="$opt -l $size"
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
--)
|
||||
# "--" can be used to separate fzf-tmux options from fzf options to
|
||||
# avoid conflicts
|
||||
skip=1
|
||||
continue
|
||||
;;
|
||||
*)
|
||||
args+=("$arg")
|
||||
;;
|
||||
esac
|
||||
[[ -n "$skip" ]] && args+=("$arg")
|
||||
done
|
||||
|
||||
if [[ -z "$TMUX" ]]; then
|
||||
"$fzf" "${args[@]}"
|
||||
exit $?
|
||||
fi
|
||||
|
||||
# --height option is not allowed. CTRL-Z is also disabled.
|
||||
args=("${args[@]}" "--no-height" "--bind=ctrl-z:ignore")
|
||||
|
||||
# Handle zoomed tmux pane without popup options by moving it to a temp window
|
||||
if [[ ! "$opt" =~ "-E" ]] && tmux list-panes -F '#F' | grep -q Z; then
|
||||
zoomed_without_popup=1
|
||||
original_window=$(tmux display-message -p "#{window_id}")
|
||||
tmp_window=$(tmux new-window -d -P -F "#{window_id}" "bash -c 'while :; do for c in \\| / - '\\;' do sleep 0.2; printf \"\\r\$c fzf-tmux is running\\r\"; done; done'")
|
||||
tmux swap-pane -t $tmp_window \; select-window -t $tmp_window
|
||||
fi
|
||||
|
||||
set -e
|
||||
|
||||
# Clean up named pipes on exit
|
||||
id=$RANDOM
|
||||
argsf="${TMPDIR:-/tmp}/fzf-args-$id"
|
||||
fifo1="${TMPDIR:-/tmp}/fzf-fifo1-$id"
|
||||
fifo2="${TMPDIR:-/tmp}/fzf-fifo2-$id"
|
||||
fifo3="${TMPDIR:-/tmp}/fzf-fifo3-$id"
|
||||
tmux_win_opts=( $(tmux show-window-options remain-on-exit \; show-window-options synchronize-panes | sed '/ off/d; s/^/set-window-option /; s/$/ \\;/') )
|
||||
cleanup() {
|
||||
\rm -f $argsf $fifo1 $fifo2 $fifo3
|
||||
|
||||
# Restore tmux window options
|
||||
if [[ "${#tmux_win_opts[@]}" -gt 0 ]]; then
|
||||
eval "tmux ${tmux_win_opts[*]}"
|
||||
fi
|
||||
|
||||
# Remove temp window if we were zoomed without popup options
|
||||
if [[ -n "$zoomed_without_popup" ]]; then
|
||||
tmux display-message -p "#{window_id}" > /dev/null
|
||||
tmux swap-pane -t $original_window \; \
|
||||
select-window -t $original_window \; \
|
||||
kill-window -t $tmp_window \; \
|
||||
resize-pane -Z
|
||||
fi
|
||||
|
||||
if [[ $# -gt 0 ]]; then
|
||||
trap - EXIT
|
||||
exit 130
|
||||
fi
|
||||
}
|
||||
trap 'cleanup 1' SIGUSR1
|
||||
trap 'cleanup' EXIT
|
||||
|
||||
envs="export TERM=$TERM "
|
||||
if [[ "$opt" =~ "-E" ]]; then
|
||||
FZF_DEFAULT_OPTS="--margin 0,1 $FZF_DEFAULT_OPTS"
|
||||
tmux_verson=$(tmux -V)
|
||||
if [[ ! $tmux_verson =~ 3\.2 ]]; then
|
||||
FZF_DEFAULT_OPTS="--border $FZF_DEFAULT_OPTS"
|
||||
opt="-B $opt"
|
||||
fi
|
||||
fi
|
||||
[[ -n "$FZF_DEFAULT_OPTS" ]] && envs="$envs FZF_DEFAULT_OPTS=$(printf %q "$FZF_DEFAULT_OPTS")"
|
||||
[[ -n "$FZF_DEFAULT_COMMAND" ]] && envs="$envs FZF_DEFAULT_COMMAND=$(printf %q "$FZF_DEFAULT_COMMAND")"
|
||||
echo "$envs;" > "$argsf"
|
||||
|
||||
# Build arguments to fzf
|
||||
opts=$(printf "%q " "${args[@]}")
|
||||
|
||||
pppid=$$
|
||||
echo -n "trap 'kill -SIGUSR1 -$pppid' EXIT SIGINT SIGTERM;" >> $argsf
|
||||
close="; trap - EXIT SIGINT SIGTERM $close"
|
||||
|
||||
export TMUX=$(cut -d , -f 1,2 <<< "$TMUX")
|
||||
mkfifo -m o+w $fifo2
|
||||
if [[ "$opt" =~ "-E" ]]; then
|
||||
cat $fifo2 &
|
||||
if [[ -n "$term" ]] || [[ -t 0 ]]; then
|
||||
cat <<< "\"$fzf\" $opts > $fifo2; out=\$? $close; exit \$out" >> $argsf
|
||||
else
|
||||
mkfifo $fifo1
|
||||
cat <<< "\"$fzf\" $opts < $fifo1 > $fifo2; out=\$? $close; exit \$out" >> $argsf
|
||||
cat <&0 > $fifo1 &
|
||||
fi
|
||||
tmux popup -d "$PWD" $opt "bash $argsf" > /dev/null 2>&1
|
||||
exit $?
|
||||
fi
|
||||
mkfifo -m o+w $fifo3
|
||||
if [[ -n "$term" ]] || [[ -t 0 ]]; then
|
||||
cat <<< "\"$fzf\" $opts > $fifo2; echo \$? > $fifo3 $close" >> $argsf
|
||||
else
|
||||
mkfifo $fifo1
|
||||
cat <<< "\"$fzf\" $opts < $fifo1 > $fifo2; echo \$? > $fifo3 $close" >> $argsf
|
||||
cat <&0 > $fifo1 &
|
||||
fi
|
||||
tmux set-window-option synchronize-panes off \;\
|
||||
set-window-option remain-on-exit off \;\
|
||||
split-window -c "$PWD" $opt "bash -c 'exec -a fzf bash $argsf'" $swap \
|
||||
> /dev/null 2>&1 || { "$fzf" "${args[@]}"; exit $?; }
|
||||
cat $fifo2
|
||||
exit "$(cat $fifo3)"
|
||||
74
dotfiles/.local/share/bash-completion/completions/nnn.bash
Normal file
74
dotfiles/.local/share/bash-completion/completions/nnn.bash
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
#
|
||||
# Rudimentary Bash completion definition for nnn.
|
||||
#
|
||||
# Author:
|
||||
# Arun Prakash Jana <engineerarun@gmail.com>
|
||||
#
|
||||
|
||||
_nnn ()
|
||||
{
|
||||
COMPREPLY=()
|
||||
local IFS=$'\n'
|
||||
local cur=$2 prev=$3
|
||||
local -a opts
|
||||
opts=(
|
||||
-a
|
||||
-A
|
||||
-b
|
||||
-B
|
||||
-c
|
||||
-C
|
||||
-d
|
||||
-D
|
||||
-e
|
||||
-E
|
||||
-f
|
||||
-g
|
||||
-H
|
||||
-i
|
||||
-J
|
||||
-K
|
||||
-l
|
||||
-n
|
||||
-o
|
||||
-p
|
||||
-P
|
||||
-Q
|
||||
-r
|
||||
-R
|
||||
-s
|
||||
-S
|
||||
-t
|
||||
-T
|
||||
-u
|
||||
-U
|
||||
-V
|
||||
-x
|
||||
-h
|
||||
)
|
||||
if [[ $prev == -b ]]; then
|
||||
local bookmarks=$(echo $NNN_BMS | awk -F: -v RS=\; '{print $1}')
|
||||
COMPREPLY=( $(compgen -W "$bookmarks" -- "$cur") )
|
||||
elif [[ $prev == -l ]]; then
|
||||
return 1
|
||||
elif [[ $prev == -p ]]; then
|
||||
COMPREPLY=( $(compgen -f -d -- "$cur") )
|
||||
elif [[ $prev == -P ]]; then
|
||||
local plugins=$(echo $NNN_PLUG | awk -F: -v RS=\; '{print $1}')
|
||||
COMPREPLY=( $(compgen -W "$plugins" -- "$cur") )
|
||||
elif [[ $prev == -s ]]; then
|
||||
local sessions_dir=${XDG_CONFIG_HOME:-$HOME/.config}/nnn/sessions
|
||||
COMPREPLY=( $(cd "$sessions_dir" && compgen -f -d -- "$cur") )
|
||||
elif [[ $prev == -t ]]; then
|
||||
return 1
|
||||
elif [[ $prev == -T ]]; then
|
||||
local keys=$(echo "a d e r s t v" | awk -v RS=' ' '{print $0}')
|
||||
COMPREPLY=( $(compgen -W "$keys" -- "$cur") )
|
||||
elif [[ $cur == -* ]]; then
|
||||
COMPREPLY=( $(compgen -W "${opts[*]}" -- "$cur") )
|
||||
else
|
||||
COMPREPLY=( $(compgen -f -d -- "$cur") )
|
||||
fi
|
||||
}
|
||||
|
||||
complete -o filenames -F _nnn nnn
|
||||
|
|
@ -22,6 +22,9 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
|
|||
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
||||
fi
|
||||
|
||||
### evalcache
|
||||
ZSH_EVALCACHE_DIR="$HOME/.local/zsh-evalcache"
|
||||
|
||||
### Fig
|
||||
[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && . "$HOME/.fig/shell/zshrc.pre.zsh"
|
||||
|
||||
|
|
@ -318,6 +321,7 @@ if command -v antigen > /dev/null; then
|
|||
antigen bundle yarn
|
||||
antigen bundle zoxide
|
||||
antigen bundle k
|
||||
antigen bundle mroth/evalcache
|
||||
antigen bundle ProfessorManhattan/zsh-completions src
|
||||
antigen bundle zsh-users/zsh-autosuggestions
|
||||
antigen bundle zsh-users/zsh-syntax-highlighting
|
||||
|
|
@ -333,13 +337,14 @@ zstyle ':autocomplete:history-incremental-search-*:*' list-lines 14
|
|||
zstyle ':autocomplete:*' fzf-completion yes
|
||||
zstyle ':autocomplete:recent-dirs' backend zoxide
|
||||
|
||||
|
||||
# oh-my-zsh might be overwriting the ls command so placing it here as well as fix
|
||||
command -v lsd > /dev/null && alias ls='lsd --group-dirs first' && \
|
||||
alias tree='lsd --tree'
|
||||
|
||||
### Deno
|
||||
if command -v deno > /dev/null; then
|
||||
eval $(deno completions zsh)
|
||||
_evalcache deno completions zsh
|
||||
fi
|
||||
|
||||
### Fig
|
||||
|
|
@ -347,14 +352,18 @@ fi
|
|||
# eval $(fig completion zsh)
|
||||
#fi
|
||||
|
||||
### fzf
|
||||
export FZF_DEFAULT_COMMAND='fd --type f --strip-cwd-prefix --hidden --follow --exclude .git'
|
||||
export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
|
||||
|
||||
### gh
|
||||
if command -v gh > /dev/null; then
|
||||
eval $(gh completion -s zsh)
|
||||
_evalcache gh completion -s zsh
|
||||
fi
|
||||
|
||||
### Helm
|
||||
if command -v helm > /dev/null; then
|
||||
eval $(helm completion zsh)
|
||||
_evalcache helm completion zsh
|
||||
fi
|
||||
|
||||
### Hyperfine
|
||||
|
|
@ -369,28 +378,28 @@ fi
|
|||
|
||||
### kubectl
|
||||
if command -v kubectl > /dev/null; then
|
||||
eval $(kubectl completion zsh)
|
||||
_evalcache kubectl completion zsh
|
||||
fi
|
||||
|
||||
### mcfly
|
||||
export MCFLY_KEY_SCHEME=vim
|
||||
if command -v mcfly > /dev/null; then
|
||||
eval "$(mcfly init zsh)"
|
||||
_evalcache mcfly init zsh
|
||||
fi
|
||||
|
||||
### Poetry
|
||||
#if command -v poetry > /dev/null; then
|
||||
# eval $(poetry completions zsh)
|
||||
# _evalcache poetry completions zsh
|
||||
#fi
|
||||
|
||||
### Volta
|
||||
if command -v volta > /dev/null; then
|
||||
eval $(volta completions zsh)
|
||||
_evalcache volta completions zsh
|
||||
fi
|
||||
|
||||
### zoxide
|
||||
if command -v zoxide > /dev/null; then
|
||||
eval "$(zoxide init --cmd cd zsh)"
|
||||
_evalcache zoxide init --cmd cd zsh
|
||||
fi
|
||||
|
||||
### Fig
|
||||
|
|
|
|||
Loading…
Reference in a new issue