diff --git a/neovim/init.vim b/neovim/init.vim
index d7cfabb..9602d06 100644
--- a/neovim/init.vim
+++ b/neovim/init.vim
@@ -123,13 +123,15 @@ noremap <leader>a :NERDTreeFind<CR>
 
 let g:python_highlight_all = 1
 
-let g:go_highlight_types = 1
+let g:go_highlight_build_constraints = 1
+let g:go_highlight_interfaces = 1
 let g:go_highlight_functions = 1
 let g:go_highlight_methods = 1
-let g:go_highlight_structs = 1
-let g:go_highlight_interfaces = 1
 let g:go_highlight_operators = 1
-let g:go_highlight_build_constraints = 1
+let g:go_highlight_structs = 1
+let g:go_highlight_types = 1
+let g:go_fmt_command = "goimports"
+
 
 let g:buffergator_viewport_split_policy = 'B'
 let g:buffergator_autoupdate = 1