diff --git a/vim/.vimrc b/vim/.vimrc
index eb53b30..f048a78 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -3,8 +3,6 @@ set background=dark
 colorscheme retrobox
 nnoremap ,rc :source $MYVIMRC<CR>
 
-autocmd FileType make setlocal noexpandtab
-autocmd FileType yaml setlocal tabstop=2
 let g:rustfmt_autosave = 0
 let g:netrw_banner = 0
 nnoremap ,cD :call setqflist(filter(getqflist(), 'v:val != getqflist()[getqflist({"idx": 0}).idx - 1]'))<CR>
@@ -84,6 +82,8 @@ au BufWinLeave *.* silent! mkview
 au FileType * setlocal indentexpr=
 au FileType lua setlocal noexpandtab
 au FileType c setlocal noexpandtab
+au FileType make setlocal noexpandtab
+au FileType yaml setlocal tabstop=2
 
 function! s:SetFileMark(n) abort
   let g:file_marks[a:n] = expand('%:p')