diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 2860489..3f68ef2 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -74,6 +74,8 @@ Plug 'neomake/neomake'
 Plug 'sk1418/QFGrep'
 Plug 'ronakg/quickr-cscope.vim'
 Plug 'stefandtw/quickfix-reflector.vim'
+Plug 'romainl/vim-qlist'
+Plug 'mhinz/vim-grepper'
 " Text Object plugins
 Plug 'kana/vim-textobj-user'
 Plug 'danidiaz/vim-textobj-do-block'
@@ -302,7 +304,8 @@ nnoremap [q :cprevious<CR>
 nnoremap ]q :cnext<CR>
 nnoremap [Q :cfirst<CR>
 nnoremap ]Q :clast<CR>
-nnoremap qs :vimgrep<SPACE>
+nnoremap qs :Grepper -nojump -query<SPACE>
+nnoremap q* :Grepper -nojump -cword<CR>
 nnoremap qt :call ToggleQuickfixList()<CR>
 nnoremap Lo :lopen<CR>
 nnoremap Lc :lclose<CR>
@@ -310,7 +313,8 @@ nnoremap [l :lprevious<CR>
 nnoremap ]l :lnext<CR>
 nnoremap [L :lfirst<CR>
 nnoremap ]L :llast<CR>
-nnoremap Ls :lvimgrep<SPACE>
+nnoremap Ls :Grepper -nojump -noquickfix -query<SPACE>
+nnoremap L* :Grepper -nojump -noquickfix -cword<CR>
 nnoremap Lt :call ToggleLocationList()<CR>
 
 " Key Bindings to help with terminal mode
@@ -711,6 +715,16 @@ let g:any_jump_search_prefered_engine = 'ag'
 " Lens vim
 let g:lens#disabled_filetypes = ['nerdtree', 'fzf', 'qf']
 
+" Vim grepper
+let g:grepper               = {}
+let g:grepper.tools         = ['rg']
+let g:grepper.quickfix      = 1
+let g:grepper.buffer        = 0
+let g:grepper.buffers       = 0
+let g:grepper.switch        = 0
+let g:grepper.append        = 1
+let g:grepper.prompt        = 0
+
 " ----------------------------- Functions ------------------------------------
 function! NvimGdbNoTKeymaps()
   tnoremap <silent> <buffer> <Esc> <C-\><C-n>