diff --git a/nvim/init.vim b/nvim/init.vim
index a8b033e..ca7bca7 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -354,7 +354,7 @@ augroup vimplug_maps
     au FileType vim nmap pg :PlugUpgrade<CR>
     au FileType vim nmap pd :PlugUpdate<CR>
     au FileType vim nmap pc :PlugClean<CR>
-	au FileType vim nmap r  :so %<CR>
+	au FileType vim nmap pr :so %<CR>
 augroup END
 
 augroup haskell_maps
@@ -420,6 +420,15 @@ augroup rust_maps
 	au FileType rust nmap <buffer> gv <plug>DeopleteRustGoToDefinitionVSplit
 	au FileType rust nmap <buffer> g- <plug>DeopleteRustGoToDefinitionSplit
 	au FileType rust nmap <buffer> gt <plug>DeopleteRustGoToDefinitionTab
+	" Taken from http://seenaburns.com/vim-setup-for-rust/
+	" Neomake
+	" Gross hack to stop Neomake running when exitting because it creates a zombie cargo check process
+	" which holds the lock and never exits. But then, if you only have QuitPre, closing one pane will
+	" disable neomake, so BufEnter reenables when you enter another buffer.
+	let s:quitting = 0
+	au FileType rust au QuitPre let s:quitting = 1
+	au FileType rust au BufEnter let s:quitting = 0
+	au FileType rust au BufWritePost if ! s:quitting | Neomake | else | echom "Neomake disabled" | endif
 augroup END
 
 augroup rainbow_lisp
@@ -440,16 +449,6 @@ augroup quickfix_close
 	au WinEnter * if winnr('$') == 1 && &buftype == "quickfix"|q|endif
 augroup END
 
-" Taken from http://seenaburns.com/vim-setup-for-rust/
-" Neomake
-" Gross hack to stop Neomake running when exitting because it creates a zombie cargo check process
-" which holds the lock and never exits. But then, if you only have QuitPre, closing one pane will
-" disable neomake, so BufEnter reenables when you enter another buffer.
-let s:quitting = 0
-au QuitPre *.rs let s:quitting = 1
-au BufEnter *.rs let s:quitting = 0
-au BufWritePost *.rs if ! s:quitting | Neomake | else | echom "Neomake disabled"| endif
-
 augroup terminal_job
 	au!
 	au TermOpen * setlocal statusline=%{b:terminal_job_id}