diff --git a/nvim/init.vim b/nvim/init.vim
index 8fcf5bd..80eceb9 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -138,6 +138,14 @@ set wildmenu
 set wildmode=list:longest,full
 set wildoptions=pum
 set pumblend=30
+set wildignore+=.hg,.git,.svn                    " Version control
+set wildignore+=*.aux,*.out,*.toc                " LaTeX intermediate files
+set wildignore+=*.jpg,*.bmp,*.gif,*.png,*.jpeg   " binary images
+set wildignore+=*.o                              " compiled object files
+set wildignore+=*.sw?                            " Vim swap files
+set wildignore+=*.luac                           " Lua byte code
+set wildignore+=*.pyc                            " Python byte code
+set wildignore+=*.orig                           " Merge resolution files
 
 if !&scrolloff
   set scrolloff=3       " Show next 3 lines while scrolling.
@@ -431,10 +439,20 @@ autocmd BufRead,BufNewFile */gst-*/*.[ch] set et sw=2
 autocmd BufRead,BufNewFile */gstreamer-*/*.[ch] set et sw=2
 autocmd BufRead,BufNewFile */pulseaudio/*.[ch] set et sw=4 tw=128
 " Configure expanding of tabs for various file types
-au BufRead,BufNewFile *.py set expandtab
 au BufRead,BufNewFile *.c set noexpandtab
 au BufRead,BufNewFile *.h set noexpandtab
 au BufRead,BufNewFile Makefile* set noexpandtab
+au BufNewFile,BufRead *.vim setlocal noet ts=4 sw=4 sts=4
+au BufNewFile,BufRead *.txt setlocal noet ts=4 sw=4
+" Lua settings
+autocmd BufNewFile,BufRead *.lua setlocal noet ts=4 sw=4 sts=4
+" Python indent
+autocmd BufNewFile,BufRead *.py setlocal tabstop=4 softtabstop=4 shiftwidth=4 textwidth=80 smarttab expandtab
+" Shell/config/systemd settings
+autocmd FileType fstab,systemd set noexpandtab
+autocmd FileType gitconfig,sh,toml set noexpandtab
+" Spell check for git commits
+autocmd FileType gitcommit setlocal spell spelllang=en_uk
 " Spell Checking
 autocmd BufRead,BufNewFile *.md,*.txt setlocal spell spelllang=en_uk
 " Automatically resize the window