nvim: update all the things

Author: debugloop

home/default.nix

@@ -121,10 +121,13 @@
       ast-grep
       buf
       codespell
+      kulala-fmt
       nodePackages_latest.prettier
       proselint
       stylua
       tree-sitter
+      typos
+      typos-lsp
       vale
       yamllint
       # dev debug

home/nvim/default.nix

@@ -22,10 +22,10 @@
     };
   in {
     "nvim/init.lua".source = ./init.lua;
-    "nvim/lua".source = ./lua;
-    # "nvim/lua".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/home/nvim/lua";
-    "nvim/ftplugin".source = ./ftplugin;
-    # "nvim/ftplugin".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/home/nvim/ftplugin";
+    # "nvim/lua".source = ./lua;
+    "nvim/lua".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/home/nvim/lua";
+    # "nvim/ftplugin".source = ./ftplugin;
+    "nvim/ftplugin".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/home/nvim/ftplugin";
     "nvim/parser".source = "${treesitterParsers}/parser";
     "nvim/after/queries/go/textobjects.scm".source = ./go-textobjects.scm;
     "nvim/after/queries/gotmpl/injections.scm".source = ./gotmpl-injections.scm;
@@ -38,12 +38,14 @@
         "diffview-nvim"
         "friendly-snippets"
         "kanagawa-nvim"
+        "kulala-nvim"
         "lazy-nvim"
         "lazydev-nvim"
         "noice-nvim"
         "nui-nvim"
         "nvim-bqf"
         "nvim-dap"
+        # "nvim-dap-view"
         "nvim-impairative"
         "nvim-lint"
         "nvim-tree-lua"

home/nvim/ftplugin/go.lua

@@ -3,168 +3,6 @@ vim.opt.tabstop = 8
 vim.opt.expandtab = false
 
 -- lsp
-vim.lsp.start({
-  name = "gopls",
-  cmd = { "gopls" },
-  filetypes = { "go", "gomod", "gowork", "gotmpl" },
-  on_attach = function(client, bufnr)
-    -- explicitly enable and modify some semantic tokens
-    if not client.server_capabilities.semanticTokensProvider then
-      local semantic = client.config.capabilities.textDocument.semanticTokens
-      if semantic == nil then
-        return
-      end
-      client.server_capabilities.semanticTokensProvider = {
-        full = true,
-        legend = {
-          tokenTypes = semantic.tokenTypes,
-          tokenModifiers = semantic.tokenModifiers,
-        },
-        range = true,
-      }
-    end
-    vim.api.nvim_create_autocmd("LspTokenUpdate", {
-      callback = function(args)
-        local token = args.data.token
-        if token.type == "keyword" and not token.modifiers.readonly then
-          local keyword =
-            vim.api.nvim_buf_get_text(args.buf, token.line, token.start_col, token.line, token.end_col, {})[1]
-          if keyword == "return" or keyword == "package" or keyword == "import" or keyword == "go" then
-            vim.lsp.semantic_tokens.highlight_token(token, args.buf, args.data.client_id, "@keyword.return")
-          end
-        end
-      end,
-    })
-  end,
-  root_dir = vim.fs.dirname(vim.fs.find({ "go.mod", "go.sum", ".git/" }, { upward = true })[1]),
-  single_file_support = true,
-  -- capabilities = vim.lsp.protocol.make_client_capabilities(),
-  capabilities = require("blink.cmp").get_lsp_capabilities(vim.lsp.protocol.make_client_capabilities()),
-  settings = {
-    gopls = {
-      -- Build: https://github.com/golang/tools/blob/master/gopls/doc/settings.md#build
-      buildFlags = { "-tags=unit,integration,e2e" },
-      -- env = {},
-      directoryFilters = { "-.git" },
-      -- templateExtensions = {},
-      -- expandWorkspaceToModule = true,
-      -- standaloneTags = { "ignore" },
-      -- workspaceFiles = {},
-
-      -- Formatting: https://github.com/golang/tools/blob/master/gopls/doc/settings.md#formatting
-      -- local = "",
-      gofumpt = true,
-      -- UI: https://github.com/golang/tools/blob/master/gopls/doc/settings.md#ui
-      codelenses = { -- https://github.com/golang/tools/blob/master/gopls/doc/codelenses.md
-        -- generate = true,
-        -- regenerate_cgo = true,
-        test = true,
-        -- run_govulncheck = false,
-        -- tidy = true,
-        -- upgrade_dependency = true,
-        -- vendor = true,
-        vulncheck = true,
-      },
-      semanticTokens = true,
-      -- noSemanticString = false,
-      -- noSemanticNumber = false,
-      -- semanticTokenTypes = {},
-      -- semanticTokenModifiers = {},
-
-      -- Completion: https://github.com/golang/tools/blob/master/gopls/doc/codelenses.md
-      -- usePlaceholders = false,
-      -- experimentalPostfixCompletions = true,
-      -- completeFunctionCalls = true,
-
-      -- Diagnostic: https://github.com/golang/tools/blob/master/gopls/doc/settings.md#diagnostic
-      analyses = { -- https://github.com/golang/tools/blob/master/gopls/doc/analyzers.md
-        -- appends = true,
-        -- asmdecl = true,
-        -- assign = true,
-        -- atomic = true,
-        -- atomicalign = true,
-        -- bools = true,
-        -- buildtag = true,
-        -- cgocall = true,
-        -- composites = true,
-        -- copylocks = true,
-        -- deepequalerrors = true,
-        -- defers = true,
-        -- deprecated = true,
-        -- directive = true,
-        -- embed = true,
-        -- errorsas = true,
-        -- fillreturns = true,
-        -- framepointer = true,
-        -- gofix = true,
-        -- hostport = true,
-        -- httpresponse = true,
-        -- ifaceassert = true,
-        -- infertypeargs = true,
-        -- loopclosure = true,
-        -- lostcancel = true,
-        -- modernize = true,
-        -- nilfunc = true,
-        -- nilness = true,
-        -- nonewvars = true,
-        -- noresultvalues = true,
-        -- printf = true,
-        -- shadow = false, -- useful, but to spammy with `err`
-        -- shift = true,
-        -- sigchanyzer = true,
-        -- simplifycompositelit = true,
-        -- simplifyrange = true,
-        -- simplifyslice = true,
-        -- sortslice = true,
-        -- stdmethods = true,
-        -- stdversion = true,
-        -- stringintconv = true,
-        -- structag = true,
-        -- testinggoroutine = true,
-        -- tests = true,
-        -- timeformat = true,
-        -- unmarshal = true,
-        -- unreachable = true,
-        -- unsafeptr = true,
-        -- unusedfunc = true,
-        -- unusedparams = true,
-        -- unusedresult = true,
-        -- unusedvariable = true,
-        -- unusedwrite = true,
-        -- waitgroup = true,
-        -- yield = true,
-      },
-      staticcheck = true,
-      vulncheck = "Imports",
-
-      -- Documentations: https://github.com/golang/tools/blob/master/gopls/doc/settings.md#documentation
-      -- hoverKind = "FullDocumentation",
-      -- linkTarget = "pkg.go.dev",
-      -- linksInHover = true, -- default
-      -- linksInHover = "gopls", -- this enables offline doc links
-
-      -- Inlayhint: https://github.com/golang/tools/blob/master/gopls/doc/settings.md#inlayhint
-      hints = { -- https://github.com/golang/tools/blob/master/gopls/doc/inlayHints.md
-        assignVariableTypes = true,
-        compositeLiteralFields = true,
-        compositeLiteralTypes = true,
-        constantValues = true,
-        functionTypeParameters = true,
-        parameterNames = true,
-        rangeVariableTypes = true,
-      },
-
-      -- Navigation: https://github.com/golang/tools/blob/master/gopls/doc/settings.md#navigation
-      -- importShortcut = "Both",
-      -- symbolScope = "all",
-
-      -- Internal
-      completeUnimported = true,
-      deepCompletion = true,
-    },
-  },
-})
-
 vim.api.nvim_create_autocmd("LspAttach", {
   group = vim.api.nvim_create_augroup("lsp_user_bindings_gopls", {}),
   callback = function(event)
@@ -256,5 +94,3 @@ vim.keymap.set("n", "gY", function()
   else
   end
 end, { desc = "copy test command" })
-
-pcall(vim.cmd, "TSContextEnable")

home/nvim/ftplugin/javascript.lua

@@ -1,21 +1,3 @@
 -- indent
 vim.opt.tabstop = 2
 vim.opt.expandtab = true
-
--- lsp
-vim.lsp.start({
-  name = "lua_ls",
-  cmd = { "lua-language-server" },
-  filetypes = { "lua" },
-  root_dir = vim.fs.dirname(vim.fs.find({ ".stylua.toml", ".git/" }, { upward = true })[1]),
-  single_file_support = true,
-  log_level = vim.lsp.protocol.MessageType.Warning,
-  settings = {
-    Lua = {
-      telemetry = { enable = false },
-      diagnostics = {
-        disable = { "missing-fields" },
-      },
-    },
-  },
-})

home/nvim/ftplugin/lua.lua

@@ -1,9 +1,6 @@
 -- no default autopair
 vim.b.minipairs_disable = true
 
--- autopair codefence on newline
-vim.keymap.set("i", "```<cr>", "```<cr>```<esc>O", { noremap = true })
-
 -- format
 vim.opt.textwidth = 100
 vim.opt.wrap = true

home/nvim/ftplugin/markdown.lua

@@ -3,12 +3,3 @@ vim.opt.commentstring = "# %s"
 -- indent
 vim.opt.tabstop = 2
 vim.opt.expandtab = true
-
--- lsp
-vim.lsp.start({
-  name = "nixd",
-  cmd = { "nixd" },
-  filetypes = { "nix" },
-  single_file_support = true,
-  root_dir = vim.fs.dirname(vim.fs.find({ "flake.nix", ".git/" }, { upward = true })[1]),
-})

home/nvim/ftplugin/nix.lua

@@ -1,6 +1,7 @@
 require("aucmd")
 require("options")
 require("maps")
+require("lsp")
 
 local lazypath = vim.fn.stdpath("data") .. "/nixpkgs/lazy-nvim"
 vim.opt.rtp:prepend(lazypath)

home/nvim/ftplugin/templ.lua

@@ -1,49 +1,3 @@
--- add this functionality when LSP attaches
-vim.api.nvim_create_autocmd("LspAttach", {
-  group = vim.api.nvim_create_augroup("on_lsp_attach", {}),
-  callback = function(event)
-    -- commands
-    vim.api.nvim_buf_create_user_command(event.buf, "LspFormat", function(_)
-      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(), true)
-      vim.cmd("edit")
-    end, { desc = "Restart all active LSP clients" })
-
-    -- mappings
-    vim.keymap.set("n", "<cr>", function()
-      vim.diagnostic.open_float()
-    end, { 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", "gD", vim.lsp.buf.type_definition, { buffer = event.buf, desc = "lsp: show type definition" })
-    vim.keymap.set("n", "gi", vim.lsp.buf.implementation, { buffer = event.buf, desc = "lsp: show implementations" })
-    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,
-      })
-    end, { buffer = event.buf, desc = "lsp: list serious diagnostics" })
-    vim.keymap.set("n", "gr", function()
-      vim.lsp.buf.references({
-        includeDeclaration = false,
-      })
-    end, { buffer = event.buf, desc = "lsp: show refs" })
-
-    -- autocmds
-    vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, {
-      group = vim.api.nvim_create_augroup("draw_references_document_highlight", { clear = true }),
-      callback = vim.lsp.buf.document_highlight,
-    })
-    vim.api.nvim_create_autocmd("CursorMoved", {
-      group = vim.api.nvim_create_augroup("clear_references_document_highlight", { clear = true }),
-      callback = vim.lsp.buf.clear_references,
-    })
-  end,
-})
-
 -- display help in a vertical split
 vim.api.nvim_create_autocmd("BufWinEnter", {
   group = vim.api.nvim_create_augroup("vertical_help", { clear = true }),
@@ -89,14 +43,26 @@ vim.api.nvim_create_autocmd({ "VimEnter" }, {
   pattern = "*",
   callback = function()
     vim.cmd("clearjumps")
+
+    vim.lsp.start({
+      cmd = { "typos-lsp" },
+      root_dir = vim.fs.dirname(vim.fs.find({ "README.md", ".git/" }, { upward = true })[1]),
+      single_file_support = true,
+      init_options = {
+        diagnosticSeverity = "hint",
+      },
+    })
   end,
 })
 
 -- do on entering insert mode
 vim.api.nvim_create_autocmd({ "InsertEnter" }, {
   group = vim.api.nvim_create_augroup("on_insert_enter", { clear = true }),
   pattern = "*",
-  callback = function()
+  callback = function(event)
+    if vim.bo[event.buf].ft:match("snacks.*") then
+      return
+    end
     vim.opt.relativenumber = false -- switch to real line numbers
   end,
 })
@@ -106,6 +72,9 @@ vim.api.nvim_create_autocmd({ "InsertLeave" }, {
   group = vim.api.nvim_create_augroup("on_insert_leave", { clear = true }),
   pattern = "*",
   callback = function(event)
+    if vim.bo[event.buf].ft:match("snacks.*") or vim.bo[event.buf].ft == "minifiles" then
+      return
+    end
     if vim.bo[event.buf].ft == "qf" then
       vim.opt.relativenumber = false
       return