diff --git a/nvim/lua/kogakure/lsp/mason.lua b/nvim/lua/kogakure/lsp/mason.lua
index f563f8d..eac1cb5 100644
--- a/nvim/lua/kogakure/lsp/mason.lua
+++ b/nvim/lua/kogakure/lsp/mason.lua
@@ -20,6 +20,8 @@ local servers = {
 	"cssmodules_ls",
 	"diagnosticls",
 	"emmet_ls",
+	"golangci_lint_ls",
+	"gopls",
 	"graphql",
 	"html",
 	"jsonls",
diff --git a/nvim/lua/kogakure/lsp/null-ls.lua b/nvim/lua/kogakure/lsp/null-ls.lua
index 1774a8e..c0f2a26 100644
--- a/nvim/lua/kogakure/lsp/null-ls.lua
+++ b/nvim/lua/kogakure/lsp/null-ls.lua
@@ -24,6 +24,7 @@ null_ls.setup({
 		diagnostics.eslint_d,
 		diagnostics.flake8, -- Python
 		diagnostics.gitlint,
+		diagnostics.golangci_lint,
 		diagnostics.markdownlint.with({ extra_args = { "--rules ~MD033" } }),
 		diagnostics.stylelint,
 		diagnostics.tsc,
@@ -32,6 +33,9 @@ null_ls.setup({
 		formatting.autopep8, -- Python
 		formatting.black.with({ extra_args = { "--fast" } }), -- Python
 		formatting.eslint_d,
+		formatting.gofmt,
+		formatting.goimports,
+		formatting.goimports_reviser,
 		formatting.markdownlint,
 		formatting.prettierd,
 		formatting.stylelint,