diff --git a/nvim/.config/nvim/after/ftplugin/c.vim b/nvim/.config/nvim/after/ftplugin/c.vim
index a1cf433..58b0b49 100644
--- a/nvim/.config/nvim/after/ftplugin/c.vim
+++ b/nvim/.config/nvim/after/ftplugin/c.vim
@@ -3,21 +3,21 @@ setlocal complete-=i
 setlocal path+=/usr/include/**
 setlocal makeprg=ninja\ -C\ build
 
-nmap <buffer> <LocalLeader>ct :AsyncDo ctags -R --fields=+nS --excmd=number .<CR>
-nmap <buffer> <LocalLeader>cu :AsyncDo cscope -bqR<CR>
-nmap <buffer> <LocalLeader>cr :cs reset<CR>
+nnoremap <buffer> <LocalLeader>ct :AsyncDo ctags -R --fields=+nS --excmd=number .<CR>
+nnoremap <buffer> <LocalLeader>cu :AsyncDo cscope -bqR<CR>
+nnoremap <buffer> <LocalLeader>cr :cs reset<CR>
 
-nmap <buffer> <silent> <LocalLeader>s  <Plug>(quickr_cscope_symbols)
-nmap <buffer> <silent> <LocalLeader>g  <Plug>(quickr_cscope_global)
-nmap <buffer> <silent> <LocalLeader>h  <Plug>(quickr_cscope_global_split)
-nmap <buffer> <silent> <LocalLeader>v  <Plug>(quickr_cscope_global_vert_split)
-nmap <buffer> <silent> <LocalLeader>d  <Plug>(quickr_cscope_functions)
-nmap <buffer> <silent> <LocalLeader>c  <Plug>(quickr_cscope_callers)
-nmap <buffer> <silent> <LocalLeader>t  <Plug>(quickr_cscope_text)
-nmap <buffer> <silent> <LocalLeader>e  <Plug>(quickr_cscope_egrep)
-nmap <buffer> <silent> <LocalLeader>f  <Plug>(quickr_cscope_files)
-nmap <buffer> <silent> <LocalLeader>i  <Plug>(quickr_cscope_includes)
-nmap <buffer> <silent> <LocalLeader>a  <Plug>(quickr_cscope_assignments)
+nnoremap <buffer> <silent> <LocalLeader>s  <Plug>(quickr_cscope_symbols)
+nnoremap <buffer> <silent> <LocalLeader>g  <Plug>(quickr_cscope_global)
+nnoremap <buffer> <silent> <LocalLeader>h  <Plug>(quickr_cscope_global_split)
+nnoremap <buffer> <silent> <LocalLeader>v  <Plug>(quickr_cscope_global_vert_split)
+nnoremap <buffer> <silent> <LocalLeader>d  <Plug>(quickr_cscope_functions)
+nnoremap <buffer> <silent> <LocalLeader>c  <Plug>(quickr_cscope_callers)
+nnoremap <buffer> <silent> <LocalLeader>t  <Plug>(quickr_cscope_text)
+nnoremap <buffer> <silent> <LocalLeader>e  <Plug>(quickr_cscope_egrep)
+nnoremap <buffer> <silent> <LocalLeader>f  <Plug>(quickr_cscope_files)
+nnoremap <buffer> <silent> <LocalLeader>i  <Plug>(quickr_cscope_includes)
+nnoremap <buffer> <silent> <LocalLeader>a  <Plug>(quickr_cscope_assignments)
 
 " If we are working with any of the gstreamer projects in C, run gst-ident
 " before saving. Assume gst-ident from gstreamer/tools/gst-indent has been
diff --git a/nvim/.config/nvim/after/ftplugin/git.vim b/nvim/.config/nvim/after/ftplugin/git.vim
index fb5b26f..29aa363 100644
--- a/nvim/.config/nvim/after/ftplugin/git.vim
+++ b/nvim/.config/nvim/after/ftplugin/git.vim
@@ -3,13 +3,13 @@ setlocal bufhidden=wipe
 " Disable whitespace highlighting in git buffer
 autocmd! BufEnter <buffer> DisableWhitespace
 
-nmap <buffer> <silent>q  :bwipeout!<CR>
+nnoremap <buffer> <silent>q  :bwipeout!<CR>
 
-nmap <buffer> <Leader>gb :call git#git_branch_checkout()<CR>
-nmap <buffer> <Leader>gB :call git#git_branch_delete()<CR>
-nmap <buffer> <Leader>gd :call git#git_diffview_commit()<CR>
-nmap <buffer> <Leader>gD :call git#git_diff_commit()<CR>
-nmap <buffer> <Leader>gl :call git#git_branch_log()<CR>
-nmap <buffer> <Leader>gL :call git#git_branch_log_pretty()<CR>
-nmap <buffer> <Leader>gp :call git#git_cherry_pick()<CR>
-xmap <buffer> <Leader>gP :<C-U>call git#git_cherry_pick_range()<CR>
+nnoremap <buffer> <Leader>gb :call git#git_branch_checkout()<CR>
+nnoremap <buffer> <Leader>gB :call git#git_branch_delete()<CR>
+nnoremap <buffer> <Leader>gd :call git#git_diffview_commit()<CR>
+nnoremap <buffer> <Leader>gD :call git#git_diff_commit()<CR>
+nnoremap <buffer> <Leader>gl :call git#git_branch_log()<CR>
+nnoremap <buffer> <Leader>gL :call git#git_branch_log_pretty()<CR>
+nnoremap <buffer> <Leader>gp :call git#git_cherry_pick()<CR>
+xnoremap <buffer> <Leader>gP :<C-U>call git#git_cherry_pick_range()<CR>
diff --git a/nvim/.config/nvim/after/ftplugin/gitcommit.vim b/nvim/.config/nvim/after/ftplugin/gitcommit.vim
index 6a2130d..9bd8a51 100644
--- a/nvim/.config/nvim/after/ftplugin/gitcommit.vim
+++ b/nvim/.config/nvim/after/ftplugin/gitcommit.vim
@@ -4,5 +4,5 @@ setlocal iskeyword+=-
 setlocal bufhidden=delete
 
 " Jump to sections of diff
-nmap <buffer> [c ?^@@<CR>
-nmap <buffer> ]c /^@@<CR>
+nnoremap <buffer> [c ?^@@<CR>
+nnoremap <buffer> ]c /^@@<CR>
diff --git a/nvim/.config/nvim/after/ftplugin/haskell.vim b/nvim/.config/nvim/after/ftplugin/haskell.vim
index e8f5841..fe70853 100644
--- a/nvim/.config/nvim/after/ftplugin/haskell.vim
+++ b/nvim/.config/nvim/after/ftplugin/haskell.vim
@@ -3,10 +3,10 @@
 compiler stack
 setlocal makeprg=stack\ build
 
-nmap <buffer> <LocalLeader>t  :AsyncDo hasktags -x -c .<CR>
-nmap <buffer> <LocalLeader>h  :AsyncDo hlint %<CR>
-nmap <buffer> <LocalLeader>g  :Ghcid<CR>
-nmap <buffer> <LocalLeader>k  :GhcidKill<CR>
+nnoremap <buffer> <LocalLeader>t  :AsyncDo hasktags -x -c .<CR>
+nnoremap <buffer> <LocalLeader>h  :AsyncDo hlint %<CR>
+nnoremap <buffer> <LocalLeader>g  :Ghcid<CR>
+nnoremap <buffer> <LocalLeader>k  :GhcidKill<CR>
 
 " Taken from https://github.com/danidiaz/miscellany/blob/master/linux/.vim/ftplugin/haskell/movements.vim
 " Next top-level type signature