feat(nvim): organizing a bit more

Signed-off-by: Carlos A Becker <caarlos0@users.noreply.github.com>

nvim/config/after/ftplugin/go.lua

@@ -1,66 +1,65 @@
 vim.opt_local.formatoptions:append("jno")
 
 local function restart(name)
-	local configs = require("lspconfig.configs")
-	local bufnr = vim.api.nvim_get_current_buf()
-	for _, client in
-		ipairs(vim.lsp.get_active_clients({
-			bufnr = bufnr,
-			name = name,
-		}))
-	do
-		vim.notify("Restarting " .. client.name .. "...")
-		client.stop()
-		vim.defer_fn(function()
-			configs[client.name].launch()
-		end, 500)
-	end
+  local configs = require("lspconfig.configs")
+  local bufnr = vim.api.nvim_get_current_buf()
+  for _, client in
+    ipairs(vim.lsp.get_active_clients({
+      bufnr = bufnr,
+      name = name,
+    }))
+  do
+    vim.notify("Restarting " .. client.name .. "...")
+    client.stop()
+    vim.defer_fn(function()
+      configs[client.name].launch()
+    end, 500)
+  end
 end
 
 local function tidy()
-	vim.notify("Running `go mod tidy`...")
-	local uv = vim.loop
-	local stdout = uv.new_pipe(false)
-	local stderr = uv.new_pipe(false)
-	local function on_read(err, _)
-		assert(not err, err)
-	end
+  vim.notify("Running `go mod tidy`...")
+  local uv = vim.loop
+  local stdout = uv.new_pipe(false)
+  local stderr = uv.new_pipe(false)
+  local function on_read(err, _)
+    assert(not err, err)
+  end
 
-	local function on_error(err, data)
-		assert(not err, err)
-		if data then
-			-- Just print errors, in case I notice in vim and want to debug
-			print(data)
-		end
-	end
+  local function on_error(err, data)
+    assert(not err, err)
+    if data then
+      -- Just print errors, in case I notice in vim and want to debug
+      print(data)
+    end
+  end
 
-	local handle
-	handle, _ = uv.spawn(
-		"go",
-		{
-			args = { "mod", "tidy" },
-			stdio = { nil, stdout, stderr },
-			cwd = vim.fn.expand("%:h"),
-		},
-		vim.schedule_wrap(function()
-			stdout:read_stop()
-			stderr:read_stop()
-			stdout:close()
-			stderr:close()
-			handle:close()
-			vim.schedule(function()
-				for _, name in ipairs({ "gopls", "golangci_lint_ls" }) do
-					restart(name)
-				end
-			end)
-		end)
-	)
-	uv.read_start(stdout, on_read)
-	uv.read_start(stderr, on_error)
-	uv.run("once")
+  local handle
+  handle, _ = uv.spawn(
+    "go",
+    {
+      args = { "mod", "tidy" },
+      stdio = { nil, stdout, stderr },
+      cwd = vim.fn.expand("%:h"),
+    },
+    vim.schedule_wrap(function()
+      stdout:read_stop()
+      stderr:read_stop()
+      stdout:close()
+      stderr:close()
+      handle:close()
+      vim.schedule(function()
+        for _, name in ipairs({ "gopls", "golangci_lint_ls" }) do
+          restart(name)
+        end
+      end)
+    end)
+  )
+  uv.read_start(stdout, on_read)
+  uv.read_start(stderr, on_error)
+  uv.run("once")
 end
 
 vim.api.nvim_create_user_command("GoModTidy", tidy, vim.tbl_extend("force", { desc = "go mod tidy" }, {}))
 
-local opts = { noremap = true, silent = true }
-vim.keymap.set("n", "<leader>gmt", ":GoModTidy<CR>", opts)
+vim.keymap.set("n", "<leader>gmt", ":GoModTidy<CR>", { noremap = true, silent = true, desc = "Run go mod tidy" })

nvim/config/after/ftplugin/json.lua

@@ -1,3 +1,2 @@
-local opts = { noremap = true, silent = true }
-vim.keymap.set("n", "<leader>jf", "<cmd>%!jq<cr>", opts)
-vim.keymap.set("n", "<leader>jm", "<cmd>%!jq -c<cr>", opts)
+vim.keymap.set("n", "<leader>jf", "<cmd>%!jq<cr>", { noremap = true, silent = true, desc = "Format with jq" })
+vim.keymap.set("n", "<leader>jm", "<cmd>%!jq -c<cr>", { noremap = true, silent = true, desc = "Minify with jq" })

nvim/config/lua/plugins/lazy.lua

@@ -45,15 +45,23 @@ return {
     "danymat/neogen",
     event = "BufEnter",
     keys = {
-      { "<leader>nf", "<cmd>Neogen<cr>", desc = "Neogen generate docs" },
+      { "<leader>nf", "<cmd>Neogen<cr>", noremap = true, silent = true, desc = "Neogen generate docs" },
     },
     config = true,
   },
   {
     "vim-test/vim-test",
     event = "BufEnter",
+    keys = {
+      { "<leader>ttn", ":TestNearest -v<CR>g", noremap = true, silent = true, desc = "Test Nearest" },
+      { "<leader>ttf", ":TestFile -v<CR>g", noremap = true, silent = true, desc = "Test File" },
+      { "<leader>tts", ":TestSuite -v<CR>g", noremap = true, silent = true, desc = "Test Suite" },
+      { "<leader>ttl", ":TestLast -v<CR>g", noremap = true, silent = true, desc = "Test Last" },
+      { "<leader>ttv", ":TestVisit -v<CR>g", noremap = true, silent = true, desc = "Test Visit" },
+    },
     config = function()
-      require("user.test")
+      vim.api.nvim_set_var("test#strategy", "neovim")
+      vim.api.nvim_set_var("test#neovim#term_position", "vert")
     end,
   },
   {
@@ -102,18 +110,18 @@ return {
   {
     "tpope/vim-fugitive",
     command = "Git",
+    keys = {
+      { "<leader>gs", vim.cmd.Git, noremap = true, silent = true, desc = "Open Git" },
+    },
     config = function()
       require("user.fugitive")
     end,
-    keys = {
-      { "<leader>gs", vim.cmd.Git, desc = "Open Git" },
-    },
   },
   {
     "mbbill/undotree",
     cmd = "UndotreeToggle",
     keys = {
-      { "<leader>u", vim.cmd.UndotreeToggle, desc = "Toggle undotree" },
+      { "<leader>u", vim.cmd.UndotreeToggle, noremap = true, silent = true, desc = "Toggle undotree" },
     },
   },
   {
@@ -125,7 +133,7 @@ return {
     "nvim-neo-tree/neo-tree.nvim",
     cmd = "Neotree",
     keys = {
-      { "<leader>tv", "<cmd>Neotree toggle<cr>", desc = "NeoTree" },
+      { "<leader>tv", "<cmd>Neotree toggle<cr>", noremap = true, silent = true, desc = "NeoTree" },
     },
     dependencies = {
       "nvim-lua/plenary.nvim",
@@ -141,7 +149,10 @@ return {
   },
   {
     "mhinz/vim-sayonara",
-    event = "VeryLazy",
+    cmd = "Sayonara",
+    keys = {
+      { "<leader>q", ":Sayonara!<CR>", noremap = true, silent = true, desc = "NeoTree" },
+    },
   },
   {
     "tpope/vim-abolish",

nvim/config/lua/plugins/lsp_cmp.lua

@@ -3,7 +3,7 @@ return {
     "simrat39/symbols-outline.nvim",
     cmd = "SymbolsOutline",
     keys = {
-      { "<leader>smb", vim.cmd.SymbolsOutline, desc = "Symbols Outline" },
+      { "<leader>smb", vim.cmd.SymbolsOutline, noremap = true, silent = true, desc = "Symbols Outline" },
     },
     config = { width = 25 },
   },

nvim/config/lua/user/fugitive.lua

@@ -6,11 +6,12 @@ vim.api.nvim_create_autocmd("BufWinEnter", {
       return
     end
 
-    local bufnr = vim.api.nvim_get_current_buf()
-    local opts = { buffer = bufnr, remap = false }
-
     vim.keymap.set("n", "<leader>Pp", function()
       vim.cmd.Git("push")
-    end, opts)
+    end, {
+      buffer = vim.api.nvim_get_current_buf(),
+      remap = false,
+      desc = "Git push",
+    })
   end,
 })

nvim/config/lua/user/keymaps.lua

@@ -38,7 +38,6 @@ keymap("n", "<S-h>", ":bprevious<CR>", opts)
 
 -- save and quit
 keymap("n", "<leader>w", ":write<CR>", opts)
-keymap("n", "<leader>q", ":Sayonara!<CR>", opts)
 
 -- paste over without replacing default register
 keymap("n", "<leader>p", '"_dP', opts)