diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index c1002f6..f21362e 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -114,6 +114,9 @@ call plug#begin('~/.config/nvim/plugged')
     " Terraform
     Plug 'hashivim/vim-terraform'
 
+    " GoLang
+    Plug 'fatih/vim-go'
+
     " Multiple cursors
     Plug 'terryma/vim-multiple-cursors'
 
@@ -626,6 +629,9 @@ au BufNewFile,BufRead,BufWritePre *.ebuild let g:shfmt_extra_args = '-ci -sr -s'
 autocmd BufWritePre *.tf lua vim.lsp.buf.formatting_sync()
 autocmd BufWritePre *.tfvars lua vim.lsp.buf.formatting_sync()
 
+" GoLang
+let g:go#fmt#autosave  = v:true
+
 " Automatically deletes all trailing whitespace and newlines at end of file on save.
 autocmd BufWritePre * %s/\s\+$//e
 autocmd BufWritepre * %s/\n\+\%$//e