Bläddra i källkod

Change prefered search tool from `ag` to `rg`

Also remove CtrlPFunky as something no longer included in the main repo.
cinaeco 6 år sedan
förälder
incheckning
7637f535a3
5 ändrade filer med 7 tillägg och 9 borttagningar
  1. 2 2
      README.md
  2. 1 1
      bin/show-versions
  3. 1 1
      vim/plugins.vim
  4. 0 4
      vim/settings/filebrowser.vim
  5. 3 1
      vim/settings/search.vim

+ 2 - 2
README.md

@@ -94,7 +94,7 @@ These dotfiles provide a dark theme and the following binding changes:
 - Colour palette: [Solarized][].
 - Font: [Meslo for Powerline][] (works well with [Rainbarf][]).
 - Vim with Ruby/Python support, or Neovim: for [Vim-Plug][] parallel downloads.
-- [The Silver Searcher][] - fast text search ([Ack][] included as fallback).
+- [Ripgrep][] - fast text search ([Ack][] included as fallback).
 - [Pandoc][] - Vim creates documents from `.pandoc` files ([Pandoc Markdown][]).
 - [pandoc-citeproc][] - bibliographical assistance when using Pandoc.
 
@@ -102,7 +102,7 @@ These dotfiles provide a dark theme and the following binding changes:
 [Meslo for Powerline]: https://github.com/powerline/fonts
 [Rainbarf]: https://github.com/creaktive/rainbarf
 [Vim-Plug]: https://github.com/junegunn/vim-plug
-[The Silver Searcher]: https://github.com/ggreer/the_silver_searcher
+[ripgrep]: https://github.com/BurntSushi/ripgrep
 [Ack]: http://beyondgrep.com/
 [Pandoc]: http://pandoc.org/
 [Pandoc Markdown]: http://pandoc.org/README.html#pandocs-markdown

+ 1 - 1
bin/show-versions

@@ -13,7 +13,7 @@ version_commands=( \
   'tmux -V' \
   'vim --version' \
   'nvim -v' \
-  'ag --version' \
+  'rg -V' \
   'pandoc -v' \
   'pandoc-citeproc -V' \
   'tmuxinator version' \

+ 1 - 1
vim/plugins.vim

@@ -47,7 +47,7 @@ Plug 'tpope/vim-surround'
 Plug 'vim-scripts/argtextobj.vim'
 " }}}
 
-" File Browser {{{
+" File Browser and Search {{{
 Plug 'ctrlpvim/ctrlp.vim'
 Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': 'yes \| ./install' }
 Plug 'junegunn/fzf.vim'

+ 0 - 4
vim/settings/filebrowser.vim

@@ -100,7 +100,3 @@ let g:ctrlp_user_command = [
   \ 'cd %s && git ls-files . -co --exclude-standard',
   \ executable('ag') ? 'ag %s -l --nocolor -g ""' : 'find %s -type f'
 \]
-
-" CtrlP Funky plugin - jump to function definitions in the current file.
-let g:ctrlp_extensions = ['funky']
-map <silent> <Leader>f :CtrlPFunky<CR>

+ 3 - 1
vim/settings/search.vim

@@ -1,5 +1,7 @@
 " use faster search tools if available
-if executable('ag')
+if executable('rg')
+  set grepprg=rg\ --vimgrep
+elseif executable('ag')
   set grepprg=ag\ --vimgrep\ $*
   set grepformat=%f:%l:%c:%m
 elseif executable('ack')