diff --git a/config/nvim/init.vim b/config/nvim/init.vim
index 7575f8a..c98ef34 100644
--- a/config/nvim/init.vim
+++ b/config/nvim/init.vim
@@ -49,6 +49,7 @@ set expandtab
 
 autocmd BufRead,BufNewFile *.h,*.c,*.cpp, set tabstop=8 shiftwidth=8 expandtab
 autocmd BufRead,BufNewFile *.cs,*.java set tabstop=4 shiftwidth=4 expandtab
+autocmd BufRead,BufNewFile *.go set tabstop=8 shiftwidth=8 noexpandtab
 autocmd BufRead,BufNewFile *.asm set filetype=nasm
 
 function TrimTrailingInvisibles()