further simplifications
This commit is contained in:
parent
b5f5dfe3dd
commit
eef44339f5
1 changed files with 13 additions and 11 deletions
24
rc/fzf.kak
24
rc/fzf.kak
|
@ -32,7 +32,7 @@ Supported tools:
|
|||
|
||||
These are default arguments for the tools above:
|
||||
<tool>: <value>:
|
||||
bat: "bat --color=always --style=header,grid,numbers {}"
|
||||
bat: "bat --color=always --style=plain {}"
|
||||
coderay: "coderay {}"
|
||||
highlight: "highlight --failsafe -O ansi {}"
|
||||
rouge: "rougify {}"
|
||||
|
@ -80,7 +80,7 @@ define-command -hidden fzf -params 2..3 %{ evaluate-commands %sh{
|
|||
if [ "$callback" = "edit" ] && [ $kak_opt_fzf_preview = "true" ]; then
|
||||
case $kak_opt_fzf_highlighter in
|
||||
bat)
|
||||
highlighter="bat --color=always --style=header,grid,numbers {}" ;;
|
||||
highlighter="bat --color=always --style=plain {}" ;;
|
||||
coderay)
|
||||
highlighter="coderay {}" ;;
|
||||
highlight)
|
||||
|
@ -94,24 +94,27 @@ define-command -hidden fzf -params 2..3 %{ evaluate-commands %sh{
|
|||
printf "%s\n" "echo -markup %{{Information}'$executable' highlighter is not supported by the script. fzf.kak may not work as you expect.}"
|
||||
highlighter=$kak_opt_fzf_highlighter ;;
|
||||
esac
|
||||
|
||||
if [ ! -z "${kak_client_env_TMUX}" ]; then
|
||||
preview_pos="pos=right:$kak_opt_fzf_preview_width;"
|
||||
tmux_height=$kak_opt_fzf_tmux_height_file_preview
|
||||
else
|
||||
preview_pos="sleep 0.1; [ \$(tput cols) -gt \$(expr \$(tput lines) \* 2) ] && pos=right:$kak_opt_fzf_preview_width || pos=top:$kak_opt_fzf_preview_height;"
|
||||
fi
|
||||
|
||||
additional_flags="--preview '($highlighter || cat {}) 2>/dev/null | head -n $kak_opt_fzf_preview_lines' --preview-window=\$pos $additional_flags"
|
||||
fi
|
||||
|
||||
shell=$(command -v sh)
|
||||
if [ ! -z "${kak_client_env_TMUX}" ]; then
|
||||
cmd="shell=$(command -v sh); SHELL=$shell; export SHELL; $preview_pos $items_command | fzf-tmux -d $tmux_height $additional_flags > $tmp"
|
||||
cmd="export SHELL=$shell; $preview_pos $items_command | fzf-tmux -d $tmux_height $additional_flags > $tmp"
|
||||
elif [ ! -z "${kak_opt_termcmd}" ]; then
|
||||
fzfcmd=$(mktemp ${TMPDIR:-/tmp}/kak-fzfcmd.XXXXXX)
|
||||
chmod 755 $fzfcmd
|
||||
printf "%s\n" "shell=$(command -v sh); SHELL=$shell; export SHELL; cd $PWD && $preview_pos $items_command | fzf $additional_flags > $tmp" > $fzfcmd
|
||||
printf "%s\n" "export SHELL=$shell; cd $PWD && $preview_pos $items_command | fzf $additional_flags > $tmp" > $fzfcmd
|
||||
cmd="$kak_opt_termcmd 'sh -c $fzfcmd'"
|
||||
else
|
||||
printf "%s\n" "fail termcmd option is not set"
|
||||
printf "%s\n" "fail %{termcmd option is not set}"
|
||||
exit
|
||||
fi
|
||||
|
||||
|
@ -127,15 +130,14 @@ define-command -hidden fzf -params 2..3 %{ evaluate-commands %sh{
|
|||
wincmd="tmux-new-vertical" ;;
|
||||
ctrl-v)
|
||||
wincmd="tmux-new-horizontal" ;;
|
||||
alt-*)
|
||||
kind="${action##*-}"
|
||||
callback="fzf-tag $kind" ;;
|
||||
*)
|
||||
printf "%s\n" "evaluate-commands -client $kak_client '$callback' '$action'" | kak -p $kak_session ;;
|
||||
if [ -n "$action" ]; then
|
||||
printf "%s\n" "evaluate-commands -client $kak_client '$callback' '$action'" | kak -p $kak_session
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
callback="$wincmd $callback"
|
||||
kakoune_command() {
|
||||
printf "%s\n" "evaluate-commands -client $kak_client '$callback' '$1'"
|
||||
printf "%s\n" "evaluate-commands -client $kak_client '$wincmd $callback' '$1'"
|
||||
}
|
||||
while read item; do
|
||||
kakoune_command "$item" | kak -p $kak_session
|
||||
|
|
Loading…
Reference in a new issue