ripgrep

aliases

@@ -17,7 +17,7 @@ alias be='bundle exec'
 
 # rails
 alias rs='rails s'
-alias rg='rails g'
+alias rag='rails g'
 alias rc='rails c'
 alias migrate='rake db:migrate db:test:prepare'
 alias bef='bundle exec foreman start -f Procfile.dev'

gitconfig

@@ -50,7 +50,7 @@
   stg    = !git checkout staging
   mstg   = !git checkout staging && git pull && git merge -
 
-  cl = !git co master && git pull && git remote prune origin && git bclean
+  cl = !git co master && git pull && git remote prune origin && git bclean && bundle
   bclean = "!f() { git branch --merged ${1-master} | grep -vE '(master|production|release|develop)' | xargs git branch -d; }; f"
 
 

vimrc

@@ -19,8 +19,11 @@ let g:fzf_layout = { 'down': '~20%' }
 Plug 'nelstrom/vim-visual-star-search'
 Plug 'terryma/vim-multiple-cursors'
 Plug 'mileszs/ack.vim'
-" Use Ag instead of Grep
-let g:ackprg = 'ag --vimgrep'
+
+" Use Ripgrep instead of Grep
+set grepprg=rg\ --vimgrep\ --no-heading'
+set grepformat=%f:%l:%c:%m,%f:%l:%m
+let g:ackprg = 'rg --vimgrep --no-heading'
 nnoremap <leader>a :Ack! <cword><CR>
 cnoreabbrev ag Ack
 cnoreabbrev aG Ack
@@ -95,15 +98,14 @@ let test#strategy = "vimux"
 nmap <silent> <leader>x :TestNearest<CR>
 nmap <silent> <leader>X :TestFile<CR>
 nmap <silent> <leader>A :TestSuite<CR>
-nmap <silent> <leader>§ :VimuxRunLastCommand<CR>
+nmap <silent> <leader>r :VimuxRunLastCommand<CR>
 " nmap <silent> <leader>g :TestVisit<CR>
 " }}}
 
 " javascript {{{
 Plug 'elzr/vim-json'
 Plug 'pangloss/vim-javascript'
 Plug 'mxw/vim-jsx'
-Plug 'roxma/nvim-cm-tern', {'do': 'npm install'}
 " }}}
 
 " new stuff {{{
@@ -314,6 +316,8 @@ noremap <Leader>v :Eview<space>
 " New stuff {{{
 noremap <c-k> :call feedkeys( line('.')==1 ? '' : 'ddkP' )<CR>
 noremap <c-j> ddp
+
+set relativenumber
 " }}}
 
 " vim: foldmethod=marker:foldlevel=1:textwidth=120:colorcolumn=120