Nulo/fzf.kak
1
0
Fork 0
Code Releases Activity

fix fzf-find in non tmux

Browse source
This commit is contained in:
Andrey Orst 2018-09-27 20:15:14 +03:00
parent bf7295a805
commit a2235dfe56
1 changed files with 176 additions and 181 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
rc/fzf.kak
View file

@ -48,11 +48,6 @@ Default arguments:
" \ " \
str fzf_tag_command "readtags" str fzf_tag_command "readtags"
declare-option -docstring "path to tmp folder
Default value: ""/tmp/""
" \
str fzf_tmp "/tmp/"
# default mappings # default mappings
map global fzf -docstring "open buffer" b '<esc>: fzf-buffer<ret>' map global fzf -docstring "open buffer" b '<esc>: fzf-buffer<ret>'
map global fzf -docstring "change directory" c '<esc>: fzf-cd<ret>' map global fzf -docstring "change directory" c '<esc>: fzf-cd<ret>'
@ -176,7 +171,7 @@ define-command -hidden fzf-buffer-search %{
message="Search buffer with fzf, and jump to result location" message="Search buffer with fzf, and jump to result location"
echo "info -title '$title' '$message'" echo "info -title '$title' '$message'"
} }
fzf "execute-keys $1 gx" "nl -b a -n ln %val{buffile}" "--reverse | awk '{print $1}'" fzf "execute-keys $1 gx" "(nl -b a -n ln %val{buffile}" "--reverse | cut -f 1)"
} }
define-command -hidden fzf -params 2..3 %{ evaluate-commands %sh{ define-command -hidden fzf -params 2..3 %{ evaluate-commands %sh{
@ -191,8 +186,8 @@ define-command -hidden fzf -params 2..3 %{ evaluate-commands %sh{
exit exit
fi fi
tmp=$(mktemp $(eval echo $kak_opt_fzf_tmp/kak-fzf.XXXXXX)) tmp=$(mktemp $(eval echo ${TMPDIR:-/tmp}/kak-fzf.XXXXXX))
exec=$(mktemp $(eval echo $kak_opt_fzf_tmp/kak-exec.XXXXXX)) exec=$(mktemp $(eval echo ${TMPDIR:-/tmp}/kak-exec.XXXXXX))
if [ ! -z "${kak_client_env_TMUX}" ]; then if [ ! -z "${kak_client_env_TMUX}" ]; then
cmd="$items_command | fzf-tmux -d 15 --color=16 --expect ctrl-q $additional_flags > $tmp" cmd="$items_command | fzf-tmux -d 15 --color=16 --expect ctrl-q $additional_flags > $tmp"
@ -201,9 +196,9 @@ define-command -hidden fzf -params 2..3 %{ evaluate-commands %sh{
cmd="$kak_opt_termcmd \"sh -c 'cd $path && $items_command | fzf --color=16 --expect ctrl-q $additional_flags > $tmp'\"" cmd="$kak_opt_termcmd \"sh -c 'cd $path && $items_command | fzf --color=16 --expect ctrl-q $additional_flags > $tmp'\""
else else
echo "fail termcmd option is not set" echo "fail termcmd option is not set"
exit
fi fi
echo $cmd > ~/cmd echo $cmd > ~/cmd
( (
eval "$cmd" eval "$cmd"
if [ -s $tmp ]; then if [ -s $tmp ]; then
@ -239,10 +234,10 @@ define-command -hidden fzf -params 2..3 %{ evaluate-commands %sh{
}} }}
define-command -hidden fzf-buffer %{ evaluate-commands %sh{ define-command -hidden fzf-buffer %{ evaluate-commands %sh{
tmp=$(mktemp $(eval echo $kak_opt_fzf_tmp/kak-fzf.XXXXXX)) tmp=$(mktemp $(eval echo ${TMPDIR:-/tmp}/kak-fzf.XXXXXX))
setbuf=$(mktemp $(eval echo $kak_opt_fzf_tmp/kak-setbuf.XXXXXX)) setbuf=$(mktemp $(eval echo ${TMPDIR:-/tmp}/kak-setbuf.XXXXXX))
delbuf=$(mktemp $(eval echo $kak_opt_fzf_tmp/kak-delbuf.XXXXXX)) delbuf=$(mktemp $(eval echo ${TMPDIR:-/tmp}/kak-delbuf.XXXXXX))
buffers=$(mktemp $(eval echo $kak_opt_fzf_tmp/kak-buffers.XXXXXX)) buffers=$(mktemp $(eval echo ${TMPDIR:-/tmp}/kak-buffers.XXXXXX))
items_command="echo $kak_buflist | tr ' ' '\n' | sort" items_command="echo $kak_buflist | tr ' ' '\n' | sort"
if [ ! -z "${kak_client_env_TMUX}" ]; then if [ ! -z "${kak_client_env_TMUX}" ]; then