From 5d119ff52a89fad68eb4e177b6de92b87728197b Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Thu, 15 Aug 2024 09:33:04 +0200 Subject: [PATCH] lf: fix ripgrep search --- .config/lf/lfrc | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/.config/lf/lfrc b/.config/lf/lfrc index 2978c597a..8d14a09d1 100644 --- a/.config/lf/lfrc +++ b/.config/lf/lfrc @@ -144,27 +144,13 @@ cmd fzf ${{ cmd find_word ${{ set +ue -RG_PREFIX="rg --hidden --column --line-number --no-heading --color=always --smart-case --follow --no-ignore" -for cmd in bat batcat head; do - command -v $cmd >/dev/null 2>&1 && break -done +rg_cmd="rg -uu --column --line-number --no-heading --color=always --smart-case --follow" res="$( - FZF_DEFAULT_COMMAND="$RG_PREFIX ." SEDPATTERN='s/\\/\\\\/g;s/"/\\"/g' SHELL="sh" \ - fzf \ - --ansi \ - --exact \ - --bind "change:reload:${RG_PREFIX} {q} || true" \ + fzf --disabled --ansi --exact --layout=reverse --header 'Searching file contents' --delimiter=: \ + --bind="start:reload([ -n {q} ] && $rg_cmd -- {q} || true)" \ + --bind="change:reload([ -n {q} ] && $rg_cmd -- {q} || true)" \ --preview-window="right,50%" \ - --preview=" - file=\$(realpath \"\$(echo {} | cut -d: -f1 | sed \"\${SEDPATTERN}\")\" 2>/dev/null) - case '$cmd' in - head) head -n 300 \"\$file\" ;; - bat*) '$cmd' --color=always --italic-text=always --style=plain --pager=never \ - --tabs=4 --theme=base16 --line-range :300 \"\$file\" ;; - esac - " \ - --layout=reverse \ - --header 'Searching file contents' + --preview='~/.config/lf/preview/clean; ~/.config/lf/preview/preview {1} "$FZF_PREVIEW_COLUMNS" "$FZF_PREVIEW_LINES" "$FZF_PREVIEW_LEFT" "$FZF_PREVIEW_TOP"' )" file="$(realpath "$(echo "$res" | cut -d':' -f1 | sed 's/\\/\\\\/g;s/"/\\"/g')" 2>/dev/null)" row="$(echo "$res" | cut -d':' -f2)"