diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 7af8f95..3349972 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -97,7 +97,12 @@ vim.o.termguicolors = true
 vim.o.signcolumn = "yes"
 vim.opt.fillchars:append({eob = " "})
 
-vim.g.mapleader = " "
+-- Go specific settings
+vim.cmd([[
+autocmd FileType go set tabstop=4
+autocmd FileType go set shiftwidth=4
+autocmd FileType go set noexpandtab
+]])
 
 vim.g.mapleader = " "