diff --git a/instances/odin/hm.nix b/instances/odin/hm.nix
index e1c6700..11119ec 100644
--- a/instances/odin/hm.nix
+++ b/instances/odin/hm.nix
@@ -85,7 +85,7 @@
     ../../modules/hm/development/data.nix
     # ../../modules/hm/development/database.nix
     ../../modules/hm/development/docker.nix
-    # ../../modules/hm/development/go.nix
+    ../../modules/hm/development/go.nix
     ../../modules/hm/development/javascript.nix
     ../../modules/hm/development/kubernetes.nix
     ../../modules/hm/development/latex.nix
diff --git a/modules/hm/development/go.nix b/modules/hm/development/go.nix
index effd36b..dfed92e 100644
--- a/modules/hm/development/go.nix
+++ b/modules/hm/development/go.nix
@@ -11,5 +11,6 @@
 
   home.packages =
     (lib.optionals config.programs.helix.enable [ pkgs.gopls ])
+    ++ (lib.optionals config.programs.neovim.enable [ pkgs.gopls ])
     ++ (lib.optionals config.programs.kakoune.enable [ pkgs.gopls ]);
 }
diff --git a/modules/hm/nvim/nvim-lspconfig-config.lua b/modules/hm/nvim/nvim-lspconfig-config.lua
index 335b288..a618e58 100644
--- a/modules/hm/nvim/nvim-lspconfig-config.lua
+++ b/modules/hm/nvim/nvim-lspconfig-config.lua
@@ -50,6 +50,7 @@ end
 
 -- LSP configuration
 lspconfig["html"].setup { capabilities = capabilities, on_attach = on_attach}
+lspconfig["gopls"].setup { capabilities = capabilities, on_attach = on_attach}
 lspconfig["pylsp"].setup { capabilities = capabilities, on_attach = on_attach}
 lspconfig["nil_ls"].setup { capabilities = capabilities, on_attach = on_attach, settings = {
   ["nil"] = {