diff --git a/README.org b/README.org
index 5cb12f0..1ad3d67 100644
--- a/README.org
+++ b/README.org
@@ -177,6 +177,7 @@ A repository of my personal configuration files.
 - [[https://github.com/airblade/vim-gitgutter][airblade/vim-gitgutter]]
 - [[https://github.com/alvan/vim-closetag][alvan/vim-closetag]]
 - [[https://github.com/dense-analysis/ale][dense-analysis/ale]]
+- [[https://github.com/fatih/vim-go][fatih/vim-go]]
 - [[https://github.com/godlygeek/tabular][godlygeek/tabular]]
 - [[https://github.com/neoclide/coc.nvim][neoclice/coc.nvim]]
 - [[https://github.com/preservim/nerdcommenter][preservim/nerdcommenter]]
diff --git a/neovim/.config/coc/extensions/package.json b/neovim/.config/coc/extensions/package.json
index d43507f..064f1f2 100644
--- a/neovim/.config/coc/extensions/package.json
+++ b/neovim/.config/coc/extensions/package.json
@@ -1,6 +1,7 @@
 {
   "dependencies": {
     "coc-css": ">=1.2.3",
+    "coc-go": ">=0.10.0",
     "coc-html": ">=1.2.4",
     "coc-jest": ">=1.0.3",
     "coc-json": ">=1.2.6",
diff --git a/neovim/.config/nvim/coc-settings.json b/neovim/.config/nvim/coc-settings.json
index c09b3a9..0967ef4 100644
--- a/neovim/.config/nvim/coc-settings.json
+++ b/neovim/.config/nvim/coc-settings.json
@@ -1,16 +1 @@
-{
-    "coc.preferences.formatOnSaveFiletypes": [
-        "css",
-        "markdown",
-        "javascript",
-        "javascriptreact",
-        "typescript",
-        "typescriptreact",
-        "json",
-        "yaml",
-        "html",
-        "graphql",
-        "mdx",
-        "rust"
-    ]
-}
+{}
diff --git a/neovim/.config/nvim/init.vim b/neovim/.config/nvim/init.vim
index 5cc8946..242e833 100644
--- a/neovim/.config/nvim/init.vim
+++ b/neovim/.config/nvim/init.vim
@@ -35,6 +35,7 @@
         Plug 'airblade/vim-gitgutter'
         Plug 'alvan/vim-closetag'
         Plug 'dense-analysis/ale'
+        Plug 'fatih/vim-go'
         Plug 'godlygeek/tabular'
         Plug 'neoclide/coc.nvim', {'branch': 'release'}
         Plug 'preservim/nerdcommenter'
@@ -69,6 +70,7 @@
     set iskeyword-=.                                                               " '.' is an end of word designator
     set iskeyword-=#                                                               " '#' is an end of word designator
     set iskeyword-=-                                                               " '-' is an end of word designator
+    set cmdheight=2                                                                " Better display for messages
 " }
 
 " Vim UI {