nvim: further fixes and clean ups

Author: debugloop

home/nvim/ftplugin/go.lua

@@ -166,3 +166,5 @@ vim.keymap.set("n", "gY", function()
   else
   end
 end, { desc = "copy test command" })
+
+pcall(vim.cmd, "TSContextEnable")

home/nvim/ftplugin/lua.lua

@@ -13,6 +13,9 @@ vim.lsp.start({
   settings = {
     Lua = {
       telemetry = { enable = false },
+      diagnostics = {
+        disable = { "missing-fields" },
+      },
     },
   },
 })

home/nvim/init.lua

@@ -15,28 +15,15 @@ require("lazy").setup({
   dev = {
     path = "~/code",
   },
-  diff = {
-    cmd = "terminal_git",
-  },
-  checker = {
-    enabled = false,
-  },
   change_detection = {
     enabled = false,
   },
-  install = {
-    colorscheme = { "kanagawa", "zaibatsu" },
-  },
-  readme = {
-    root = vim.fn.stdpath("data") .. "/lazy-readme",
-  },
-  state = vim.fn.stdpath("data") .. "/lazy-state.json",
   performance = {
     rtp = {
       disabled_plugins = {
         "gzip",
         "matchit",
-        "netrw",
+        "matchparen",
         "netrwPlugin",
         "tarPlugin",
         "tohtml",

home/nvim/lua/aucmd.lua

@@ -7,36 +7,36 @@ vim.api.nvim_create_autocmd("LspAttach", {
       vim.lsp.buf.format()
     end, { desc = "Format current buffer with LSP" })
     vim.api.nvim_buf_create_user_command(event.buf, "LspRestart", function(_)
-      vim.lsp.stop_client(vim.lsp.get_clients())
+      vim.lsp.stop_client(vim.lsp.get_clients(), true)
       vim.cmd("edit")
     end, { desc = "Restart all active LSP clients" })
 
     -- mappings
+    vim.keymap.set("n", "<cr>", vim.diagnostic.open_float, { buffer = event.buf, desc = "lsp: open diagnostic" })
     vim.keymap.set("n", "gd", vim.lsp.buf.definition, { buffer = event.buf, desc = "lsp: show definition" })
-    vim.keymap.set("n", "<c-w>d", function()
-      vim.cmd.vsplit()
-      vim.lsp.buf.definition()
-    end, { buffer = event.buf, desc = "lsp: show definition in new split" })
     vim.keymap.set("n", "gD", vim.lsp.buf.type_definition, { buffer = event.buf, desc = "lsp: show type definition" })
-    vim.keymap.set("n", "gr", function()
-      vim.lsp.buf.references({ includeDeclaration = false })
-    end, { buffer = event.buf, desc = "lsp: show refs" })
     vim.keymap.set("n", "gi", vim.lsp.buf.implementation, { buffer = event.buf, desc = "lsp: show implementations" })
     vim.keymap.set("n", "go", vim.lsp.buf.document_symbol, { buffer = event.buf, desc = "lsp: outline symbols" })
+    vim.keymap.set("n", "<leader>r", vim.lsp.buf.rename, { buffer = event.buf, desc = "lsp: rename symbol" })
+    vim.keymap.set("n", "<leader>?", vim.lsp.buf.code_action, { buffer = event.buf, desc = "lsp: run code action" })
     vim.keymap.set("n", "<leader>qd", vim.diagnostic.setqflist, { buffer = event.buf, desc = "lsp: list diagnostics" })
     vim.keymap.set("n", "<leader>qD", function()
-      vim.diagnostic.setqflist({ severity = vim.diagnostic.severity.ERROR })
+      vim.diagnostic.setqflist({
+        severity = vim.diagnostic.severity.ERROR,
+      })
     end, { buffer = event.buf, desc = "lsp: list serious diagnostics" })
-    vim.keymap.set("n", "<leader>r", vim.lsp.buf.rename, { buffer = event.buf, desc = "lsp: rename symbol" })
-    vim.keymap.set("n", "<leader>?", vim.lsp.buf.code_action, { buffer = event.buf, desc = "lsp: run code action" })
-    vim.keymap.set("n", "<cr>", vim.diagnostic.open_float, { buffer = event.buf, desc = "lsp: open diagnostic" })
+    vim.keymap.set("n", "gr", function()
+      vim.lsp.buf.references({
+        includeDeclaration = false,
+      })
+    end, { buffer = event.buf, desc = "lsp: show refs" })
   end,
 })
 
 -- display help in a vertical split
 vim.api.nvim_create_autocmd("BufWinEnter", {
   group = vim.api.nvim_create_augroup("vertical_help", { clear = true }),
-  pattern = { "*.txt" },
+  pattern = { "*.txt", "*.md" },
   callback = function()
     if vim.o.filetype == "help" then
       vim.cmd.wincmd("L")
@@ -61,7 +61,6 @@ vim.api.nvim_create_autocmd("FileType", {
     "dap-float",
     "dap-preview",
     "git",
-    "lspinfo",
     "man",
     "notify",
     "qf",
@@ -88,7 +87,6 @@ vim.api.nvim_create_autocmd({ "InsertEnter" }, {
   pattern = "*",
   callback = function()
     vim.opt.relativenumber = false -- switch to real line numbers
-    vim.g.miniindentscope_disable = true -- disable indent guides
   end,
 })
 
@@ -102,7 +100,6 @@ vim.api.nvim_create_autocmd({ "InsertLeave" }, {
       return
     end
     vim.opt.relativenumber = true -- switch to relative line numbers
-    vim.g.miniindentscope_disable = false -- re-enable indent guides
   end,
 })
 
@@ -134,7 +131,7 @@ vim.api.nvim_create_autocmd({ "VimEnter" }, {
 
 -- autocmds for every buffer
 vim.api.nvim_create_autocmd({ "BufRead" }, {
-  group = vim.api.nvim_create_augroup("autocmd_on_buf_enter", { clear = true }),
+  group = vim.api.nvim_create_augroup("add_autocmd_on_buf_enter", { clear = true }),
   pattern = { "*" },
   callback = function(_)
     -- skip those on some filetypes
@@ -180,54 +177,3 @@ vim.api.nvim_create_autocmd({ "WinEnter", "BufWinEnter", "TermOpen" }, {
     end
   end,
 })
-
--- highlight definitions (adapted from nvim-treesitter-refactor)
-vim.g.disable_highlight_defs = false
-local highlight_defs_augroup = vim.api.nvim_create_augroup("highlight_defs", { clear = true })
-local highlight_defs = vim.api.nvim_create_namespace("nvim_treesitter_usages")
-vim.api.nvim_create_autocmd({ "CursorHold" }, {
-  group = highlight_defs_augroup,
-  callback = function(event)
-    if vim.g.disable_highlight_defs then
-      return
-    end
-    local ts_utils = require("nvim-treesitter.ts_utils")
-    local locals = require("nvim-treesitter.locals")
-    local last_nodes = {}
-    local node_at_point = ts_utils.get_node_at_cursor()
-    -- Don't calculate usages again if we are on the same node.
-    if
-      node_at_point
-      and node_at_point == last_nodes[event.buf]
-      and #vim.api.nvim_buf_get_extmarks(event.buf, highlight_defs, 0, -1, {}) > 0
-    then
-      return
-    else
-      last_nodes[event.buf] = node_at_point
-    end
-
-    vim.api.nvim_buf_clear_namespace(event.buf, highlight_defs, 0, -1)
-    if not node_at_point then
-      return
-    end
-
-    local def_node, scope = locals.find_definition(node_at_point, event.buf)
-    local usages = locals.find_usages(def_node, scope, event.buf)
-
-    for _, usage_node in ipairs(usages) do
-      if usage_node ~= node_at_point and usage_node ~= def_node then
-        ts_utils.highlight_node(usage_node, event.buf, highlight_defs, "CurSearch")
-      end
-    end
-
-    if def_node ~= node_at_point then
-      ts_utils.highlight_node(def_node, event.buf, highlight_defs, "IncSearch")
-    end
-  end,
-})
-vim.api.nvim_create_autocmd({ "CursorMoved", "InsertEnter" }, {
-  group = highlight_defs_augroup,
-  callback = function(event)
-    vim.api.nvim_buf_clear_namespace(event.buf, highlight_defs, 0, -1)
-  end,
-})

home/nvim/lua/maps.lua

@@ -16,10 +16,13 @@ vim.keymap.set({ "o", "x" }, "H", "^", { desc = "go to start of line" })
 vim.keymap.set({ "n", "o", "x" }, "L", "$", { desc = "go to end of line" })
 
 -- better paste
-vim.keymap.set("n", "<leader>p", function()
+vim.keymap.set({ "n", "x" }, "<leader>p", '"+p', { desc = "paste system clipboard" })
+vim.keymap.set({ "n", "x" }, "<leader>P", function()
   vim.fn.setreg("+", vim.fn.getreg("+"), "V")
-  vim.cmd.normal("p")
-end, { desc = "paste as lines" })
+  vim.cmd.normal('"+p')
+end, { desc = "paste system clipboard as lines" })
+-- better paste
+vim.keymap.set({ "n", "x" }, "<leader>y", '"+y', { desc = "yank system clipboard" })
 
 -- live grep
 vim.keymap.set("x", "<leader>*", function()
@@ -99,7 +102,7 @@ vim.keymap.set("n", "<s-tab>", function()
   vim.cmd("bp")
 end, { silent = true, desc = "go to previous buffer" })
 vim.keymap.set("n", "<leader>x", function()
-  vim.print("Clearing buffers...")
+  vim.notify("Clearing buffers...")
   for _, bufnr in ipairs(vim.api.nvim_list_bufs()) do
     if
       vim.bo[bufnr].buflisted

home/nvim/lua/options.lua

@@ -1,5 +1,4 @@
 -- general behavior
-vim.opt.clipboard = "unnamedplus" -- sync yank with system clipboard
 vim.opt.updatetime = 500 -- faster CursorHold
 vim.opt.mouse = "" -- no mouse
 vim.opt.jumpoptions = "stack,view" -- discard jumps when diverging from an earlier position
@@ -36,7 +35,6 @@ vim.opt.smartcase = true -- search case-sensitive when capital letters are searc
 -- ui
 vim.opt.cmdheight = 0 -- more space on the bottom
 vim.opt.laststatus = 3 -- global statusline
-vim.opt.signcolumn = "yes" -- always show signcolumn
 
 -- virtual text
 vim.opt.listchars = "eol:¬,tab:»·,trail:~,space:·" -- list these chars if enabled
@@ -71,9 +69,3 @@ vim.filetype.add({
 vim.diagnostic.config({
   severity_sort = true,
 })
-
-vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {
-  -- border = { "", "", "", "│", "", "", "", "│" },
-  border = "none",
-  max_width = 120,
-})