diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 709f7cfa..21039fe6 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -30,9 +30,23 @@ nnoremap k gk
 noremap <leader><leader> :GFiles<CR>
 noremap <leader>pf :Files<CR>
 nnoremap <leader>C        :Colors<CR>
-nnoremap <leader><CR>     :Buffers<CR>
+nnoremap <leader>B        :Buffers<CR>
 nnoremap <leader>fl       :Lines<CR>
-nnoremap <leader>m        :History<CR>
+noremap <leader>m        :History<CR>
+noremap <leader>/        :Rg<space>
+
+" Use fuzzy completion relative filepaths across directory
+imap <expr> <c-x><c-f> fzf#vim#complete#path('git ls-files $(git rev-parse --show-toplevel)')
+
+" Better command history with q:
+command! CmdHist call fzf#vim#command_history({'right': '40'})
+nnoremap q: :CmdHist<CR>
+
+" Better search history
+command! QHist call fzf#vim#search_history({'right': '40'})
+nnoremap q/ :QHist<CR>
+
+command! -bang -nargs=* Ack call fzf#vim#ag(<q-args>, {'down': '40%', 'options': --no-color'})
 
 inoremap <F1> <ESC>
 nnoremap <F1> <ESC>