From 1b35237130e9c3e5d1bd20cb40f6013c74f0b925 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Wed, 9 Oct 2019 00:34:58 -0400 Subject: try switching to ripgrep --- bin/ag | 1 + bin/rg | 3 +++ config/sh/aliases | 1 - vimrc | 10 +++++----- 4 files changed, 9 insertions(+), 6 deletions(-) create mode 120000 bin/ag create mode 100755 bin/rg diff --git a/bin/ag b/bin/ag new file mode 120000 index 0000000..5b2ddf3 --- /dev/null +++ b/bin/ag @@ -0,0 +1 @@ +rg \ No newline at end of file diff --git a/bin/rg b/bin/rg new file mode 100755 index 0000000..05c051c --- /dev/null +++ b/bin/rg @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/bin/rg --smart-case --no-ignore-messages -p "$@" | less -XFR diff --git a/config/sh/aliases b/config/sh/aliases index 1d2c28f..72f8f14 100644 --- a/config/sh/aliases +++ b/config/sh/aliases @@ -6,7 +6,6 @@ alias rm="rm -i" alias cp="cp -i" alias mv="mv -i" alias bc="bc -lq" -alias ag="ag --pager=less --smart-case" type forkprove > /dev/null 2>&1 && alias prove="forkprove" type tput > /dev/null 2>&1 && alias reset="tput reset" # }}} diff --git a/vimrc b/vimrc index a02fe2c..f494685 100644 --- a/vimrc +++ b/vimrc @@ -96,14 +96,14 @@ function! s:fzf_files() exe "Files" endif endfunction -command! -bang -nargs=* Ag - \ call fzf#vim#ag(, - \ "--hidden", +command! -bang -nargs=* Rg + \ call fzf#vim#grep('rg --column --line-number --no-heading --color=always --smart-case --no-ignore-messages '.shellescape(), + \ 1, \ 0 ? fzf#vim#with_preview(s:ag_opts, 'up:60%') \ : fzf#vim#with_preview(s:ag_opts, s:horiz_preview_layout, '?'), \ 0) nnoremap t :call fzf_files() -nnoremap ff :Ag +nnoremap ff :Rg nnoremap fh :Helptags nnoremap ft :Filetypes " }}} @@ -174,7 +174,7 @@ let g:startify_list_order = ['dir', 'bookmarks', 'commands'] let g:startify_files_number = 7 let g:startify_commands = [ \ {'t': ['Open file', 'Files']}, - \ {'ff': ['Grep', 'Ag']}, + \ {'ff': ['Grep', 'Rg']}, \ {'fh': ['Help', 'Helptags']}, \ ] let g:startify_change_to_vcs_root = 1 -- cgit v1.2.3