3 files changed, 33 insertions, 44 deletions

diff --git a/lua/gabrielgio/formatter.lua b/lua/gabrielgio/formatter.lua
index ca0ebc7..bf882bc 100644
--- a/lua/gabrielgio/formatter.lua
+++ b/lua/gabrielgio/formatter.lua
@@ -2,6 +2,21 @@ local formatter = require("formatter")
 local go = require("formatter.filetypes.go")
 local util = require("formatter.util")
 
+local function yamlfmt()
+	return { exe = "yamlfmt" }
+end
+
+local function terraformfmt()
+	return {
+		exe = "terraform",
+		args = {
+			"fmt",
+			"-",
+		},
+		stdin = true,
+	}
+end
+
 formatter.setup({
 	filetype = {
 		nix = { require("formatter.filetypes.nix").alejandra },
@@ -9,31 +24,19 @@ formatter.setup({
 		fish = { require("formatter.filetypes.fish").fishindent },
 		javascript = { require("formatter.filetypes.javascript").prettier },
 		go = { go.gofumpt, go.goimports },
-		terraform = {
-			function()
-				return {
-					exe = "terraform",
-					args = {
-						"fmt",
-						"-",
-					},
-					stdin = true,
-				}
-			end,
-		},
-		yaml = {
-			function()
-				return { exe = "yamlfmt" }
-			end,
-		},
+		terraform = { terraformfmt },
+		yaml = { yamlfmt },
 	},
 	["*"] = {
 		require("formatter.filetypes.any").remove_trailing_whitespace,
 	},
 })
 
-vim.api.nvim_create_augroup("__formatter__", { clear = true })
-vim.api.nvim_create_autocmd("BufWritePost", {
+local augroup = vim.api.nvim_create_augroup
+local autocmd = vim.api.nvim_create_autocmd
+
+augroup("__formatter__", { clear = true })
+autocmd("BufWritePost", {
 	group = "__formatter__",
 	command = ":FormatWrite",
 })
diff --git a/lua/gabrielgio/lsp.lua b/lua/gabrielgio/lsp.lua
index dc617d5..5eb3908 100644
--- a/lua/gabrielgio/lsp.lua
+++ b/lua/gabrielgio/lsp.lua
@@ -5,17 +5,14 @@ local function set_key(mode, keys, v, opts)
 end
 
 local function on_attach(client, bufnr)
-	do
-		local bufopts = { noremap = true, silent = true, buffer = bufnr }
-		set_key("n", "gD", vim.lsp.buf.declaration, bufopts)
-		set_key("n", "gd", vim.lsp.buf.definition, bufopts)
-		set_key("n", "K", vim.lsp.buf.hover, bufopts)
-		set_key("n", "gi", vim.lsp.buf.implementation, bufopts)
-		set_key("n", "<C-s>", vim.lsp.buf.signature_help, bufopts)
-		set_key("n", "<space>rn", vim.lsp.buf.declaration, bufopts)
-		set_key("n", "<space>ca", vim.lsp.buf.code_action, bufopts)
-		set_key("n", "<space>f", vim.lsp.buf.formatting, bufopts)
-	end
+	local bufopts = { noremap = true, silent = true, buffer = bufnr }
+	set_key("n", "gD", vim.lsp.buf.declaration, bufopts)
+	set_key("n", "gd", vim.lsp.buf.definition, bufopts)
+	set_key("n", "K", vim.lsp.buf.hover, bufopts)
+	set_key("n", "gi", vim.lsp.buf.implementation, bufopts)
+	set_key("n", "<C-s>", vim.lsp.buf.signature_help, bufopts)
+	set_key("n", "<space>rn", vim.lsp.buf.declaration, bufopts)
+	set_key("n", "<space>ca", vim.lsp.buf.code_action, bufopts)
 	return bufnr
 end
 
@@ -48,6 +45,7 @@ lsp_config.gopls.setup({
 })
 
 lsp_config.lua_ls.setup({
+	on_attach = on_attach,
 	settings = {
 		Lua = {
 			diagnostics = {
diff --git a/lua/gabrielgio/trouble.lua b/lua/gabrielgio/trouble.lua
index 9249c07..37ade3e 100644
--- a/lua/gabrielgio/trouble.lua
+++ b/lua/gabrielgio/trouble.lua
@@ -1,18 +1,6 @@
 local key = require("gabrielgio.key")
 local trouble = require("trouble")
 
-trouble.setup({
-	modes = {
-		test = {
-			mode = "diagnostics",
-			preview = {
-				type = "split",
-				relative = "win",
-				position = "right",
-				size = 0.3,
-			},
-		},
-	},
-})
+trouble.setup()
 
-key.nnoremap("<leader>t", ":Trouble test toggle<cr>")
+key.nnoremap("<leader>t", ":Trouble diagnostics toggle<cr>")