1
0
Fork 0

further simplifications

This commit is contained in:
Andrey Orst 2018-11-23 14:43:42 +03:00
parent b5f5dfe3dd
commit eef44339f5

View file

@ -32,7 +32,7 @@ Supported tools:
These are default arguments for the tools above: These are default arguments for the tools above:
<tool>: <value>: <tool>: <value>:
bat: "bat --color=always --style=header,grid,numbers {}" bat: "bat --color=always --style=plain {}"
coderay: "coderay {}" coderay: "coderay {}"
highlight: "highlight --failsafe -O ansi {}" highlight: "highlight --failsafe -O ansi {}"
rouge: "rougify {}" 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 if [ "$callback" = "edit" ] && [ $kak_opt_fzf_preview = "true" ]; then
case $kak_opt_fzf_highlighter in case $kak_opt_fzf_highlighter in
bat) bat)
highlighter="bat --color=always --style=header,grid,numbers {}" ;; highlighter="bat --color=always --style=plain {}" ;;
coderay) coderay)
highlighter="coderay {}" ;; highlighter="coderay {}" ;;
highlight) 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.}" 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 ;; highlighter=$kak_opt_fzf_highlighter ;;
esac esac
if [ ! -z "${kak_client_env_TMUX}" ]; then if [ ! -z "${kak_client_env_TMUX}" ]; then
preview_pos="pos=right:$kak_opt_fzf_preview_width;" preview_pos="pos=right:$kak_opt_fzf_preview_width;"
tmux_height=$kak_opt_fzf_tmux_height_file_preview tmux_height=$kak_opt_fzf_tmux_height_file_preview
else 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;" 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 fi
additional_flags="--preview '($highlighter || cat {}) 2>/dev/null | head -n $kak_opt_fzf_preview_lines' --preview-window=\$pos $additional_flags" additional_flags="--preview '($highlighter || cat {}) 2>/dev/null | head -n $kak_opt_fzf_preview_lines' --preview-window=\$pos $additional_flags"
fi fi
shell=$(command -v sh)
if [ ! -z "${kak_client_env_TMUX}" ]; then 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 elif [ ! -z "${kak_opt_termcmd}" ]; then
fzfcmd=$(mktemp ${TMPDIR:-/tmp}/kak-fzfcmd.XXXXXX) fzfcmd=$(mktemp ${TMPDIR:-/tmp}/kak-fzfcmd.XXXXXX)
chmod 755 $fzfcmd 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'" cmd="$kak_opt_termcmd 'sh -c $fzfcmd'"
else else
printf "%s\n" "fail termcmd option is not set" printf "%s\n" "fail %{termcmd option is not set}"
exit exit
fi fi
@ -127,15 +130,14 @@ define-command -hidden fzf -params 2..3 %{ evaluate-commands %sh{
wincmd="tmux-new-vertical" ;; wincmd="tmux-new-vertical" ;;
ctrl-v) ctrl-v)
wincmd="tmux-new-horizontal" ;; 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 esac
callback="$wincmd $callback"
kakoune_command() { 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 while read item; do
kakoune_command "$item" | kak -p $kak_session kakoune_command "$item" | kak -p $kak_session