diff --git a/fish/conf.d/fzf.fish b/fish/conf.d/fzf.fish index 5dbdb2c..cffb7b1 100644 --- a/fish/conf.d/fzf.fish +++ b/fish/conf.d/fzf.fish @@ -4,8 +4,21 @@ set -gx FZF_DEFAULT_COMMAND 'fd --type=file' function __fzf_files set -l output ( - fd --type=file --hidden --follow --color=always --exclude=.git --strip-cwd-prefix 2>/dev/null | - fzf --ansi --preview='bat --style=numbers --color=always {}' --preview-window='right:70%:hidden:wrap' --bind='?:toggle-preview' --expect='ctrl-e' --header='ctrl-e to edit, ? to preview' + fd \ + --type=file \ + --hidden \ + --follow \ + --color=always \ + --exclude=.git \ + --strip-cwd-prefix \ + 2>/dev/null | + fzf \ + --ansi \ + --preview='bat --style=numbers --color=always {}' \ + --preview-window='right,70%,wrap,hidden,<200(bottom,50%)' \ + --bind='?:toggle-preview' \ + --expect='ctrl-e' \ + --header='ctrl-e to edit, ? to preview' ) set -l key $output[1] set -l file $output[2] @@ -25,7 +38,13 @@ function __fzf_git_log else set -l output ( command git logsearch | - fzf --ansi --tiebreak=index --preview='git show --color {2}' --preview-window='right:70%:hidden:wrap' --bind='?:toggle-preview' --header='? to preview' + fzf \ + --ansi \ + --tiebreak=index \ + --preview='git show --color {2}' \ + --preview-window='right,70%,wrap,hidden,<200(bottom,50%)' \ + --bind='?:toggle-preview' \ + --header='? to preview' ) if set -l commit_hash (string split --max 2 " " $output)[2] commandline -i $commit_hash @@ -37,8 +56,17 @@ end function __fzf_history set -l separator ' | ' set -l output ( - history search --null --show-time="%Y-%m-%d$separator" | - fzf --read0 --tiebreak=index --query=(commandline) --preview='echo {3..}' --preview-window='bottom:50%:hidden:wrap' --bind='?:toggle-preview' --header='? to preview' + history search \ + --null \ + --show-time="%Y-%m-%d$separator" | + fzf \ + --read0 \ + --tiebreak=index \ + --query=(commandline) \ + --preview='echo {3..}' \ + --preview-window='down,10,wrap,hidden' \ + --bind='?:toggle-preview' \ + --header='? to preview' ) if set -l command (string split --max 1 $separator $output)[2..-1] commandline -r $command