diff --git a/init.lua b/init.lua
index 76b2c450..08a60544 100644
--- a/init.lua
+++ b/init.lua
@@ -285,7 +285,7 @@ vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { de
 -- See `:help nvim-treesitter`
 require('nvim-treesitter.configs').setup {
   -- Add languages to be installed here that you want installed for treesitter
-  ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'vimdoc', 'vim', 'clojure', 'commonlisp' },
+  ensure_installed = { 'c', 'go', 'gomod', 'gosum', 'gowork', 'lua', 'vimdoc', 'vim', 'clojure', 'commonlisp' },
 
   -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
   auto_install = true,
@@ -408,7 +408,7 @@ end
 --  define the property 'filetypes' to the map in question.
 local servers = {
   -- clangd = {},
-  -- gopls = {},
+  gopls = {},
   -- pyright = {},
   -- rust_analyzer = {},
   -- tsserver = {},
diff --git a/lua/custom/plugins/golang.lua b/lua/custom/plugins/golang.lua
new file mode 100644
index 00000000..c6507c90
--- /dev/null
+++ b/lua/custom/plugins/golang.lua
@@ -0,0 +1,4 @@
+return {
+	"fatih/vim-go",
+	ft = "go"
+}