nvim: weekend tinkering

Author: debugloop

home/nvim/after/queries/go/textobjects.scm

@@ -1,48 +1,17 @@
 ;; extends
 
-; add variadic_parameter_declaration
+; standalone variadic parameter
 (parameter_list
-  .
+  ("," @_start
+  .)?
   (variadic_parameter_declaration) @parameter.inner
-  .
-  ","? @_end
-  (#make-range! "parameter.outer" @parameter.inner @_end))
+  (#make-range! "parameter.outer" @_start @parameter.inner))
 
-; peeking should show the body of functions and types
-[ (type_declaration) (function_declaration) (method_declaration) ] @peek
+(function_declaration (identifier)  @function.name)
+(method_declaration (field_identifier)  @function.name)
 
-; struct and interface declaration as customtype textobject
-(type_declaration
-  (type_spec
-    (type_identifier)
-    (struct_type))) @customtype.outer
-
-(type_declaration
-  (type_spec
-    (type_identifier)
-    (struct_type
-      (field_declaration_list
-        "{"
-        .
-        _ @_start @_end
-        _? @_end
-        .
-        "}"
-        (#make-range! "customtype.inner" @_start @_end)))))
-
-(type_declaration
-  (type_spec
-    (type_identifier)
-    (interface_type))) @customtype.outer
-
-(type_declaration
-  (type_spec
-    (type_identifier)
-    (interface_type
-      "{"
-      .
-      _ @_start @_end
-      _? @_end
-      .
-      "}"
-      (#make-range! "customtype.inner" @_start @_end))))
+(
+	((comment)*) @doc
+	.
+	(method_declaration) @def
+) @function.all

home/nvim/default.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   lib,
+  config,
   ...
 }: {
   programs.neovim = {
@@ -19,13 +20,17 @@
       #   pkgs.vimPlugins.nvim-treesitter.withAllGrammars.dependencies;
     };
   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/parser".source = "${treesitterParsers}/parser";
-    "nvim/after".source = ./after;
+    # "nvim/init.lua".source = ./init.lua;
+    # "nvim/lua".source = ./lua;
+    # "nvim/ftplugin".source = ./ftplugin;
+    # "nvim/after".source = ./after;
+
+    "nvim/init.lua".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/home/nvim/init.lua";
+    "nvim/lua".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/home/nvim/lua";
+    "nvim/ftplugin".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/home/nvim/ftplugin";
+    "nvim/after".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/home/nvim/after";
+
+    "nvim/parser".source = "${treesitterParsers}/parser"; # treesitter master only
   };
 
   xdg.dataFile = let
@@ -41,14 +46,12 @@
         "noice-nvim"
         "nui-nvim"
         "nvim-dap"
-        # "nvim-dap-view"
-        "nvim-impairative"
+        # "nvim-dap-view" # not in nixpkgs
         "nvim-lint"
-        "nvim-tree-lua"
-        "nvim-treesitter"
+        "nvim-treesitter" # uses master
         "nvim-treesitter-context"
-        "nvim-treesitter-textobjects"
-        "render-markdown-nvim"
+        "nvim-treesitter-textobjects" # uses master
+        "quicker-nvim"
         "snacks-nvim"
       ]
       (
@@ -77,6 +80,7 @@
         "mini-operators"
         "mini-pairs"
         "mini-pick"
+        "mini-sessions"
         "mini-splitjoin"
         "mini-statusline"
         "mini-surround"
@@ -94,6 +98,17 @@
     );
   in
     {
+      "nvim/nixpkgs/fzf" = {
+        source = "${pkgs.fzf}/share/vim-plugins/fzf";
+      };
+
+      # treesitter main parsers:
+      # "nvim/site/queries" = {
+      #   source = "${pkgs.vimPlugins.nvim-treesitter.withAllGrammars}/queries";
+      # };
+      # "nvim/site/parser".source = "${treesitterParsers}/parser";
+
+      # for switching to treesitter main:
       # "nvim/nixpkgs/nvim-treesitter-textobjects" = {
       #   source = pkgs.fetchFromGitHub {
       #     owner = "nvim-treesitter";

home/nvim/ftplugin/go.lua

@@ -6,13 +6,6 @@ vim.opt.expandtab = false
 vim.api.nvim_create_autocmd("LspAttach", {
   group = vim.api.nvim_create_augroup("lsp_user_bindings_gopls", {}),
   callback = function(event)
-    -- get gc details
-    vim.keymap.set("n", "<leader>G", function()
-      vim.lsp.buf_request_sync(0, "workspace/executeCommand", {
-        command = "gopls.gc_details",
-        arguments = { "file://" .. vim.api.nvim_buf_get_name(0) },
-      }, 2000)
-    end, { desc = "lsp: show GC details", buffer = event.buf })
     -- run current test
     vim.keymap.set("n", "<leader>t", function()
       local ok, inTestfile, testName = pcall(SurroundingTestName)
@@ -29,9 +22,9 @@ vim.api.nvim_create_autocmd("LspAttach", {
         },
       }, 10000)
       if not result or result[1].error then
-        vim.notify("Test failed", 4)
+        vim.notify("Test failed", vim.log.levels.ERROR)
       else
-        vim.notify("Test ok", 2)
+        vim.notify("Test ok", vim.log.levels.INFO)
       end
     end, { desc = "lsp: run test at cursor", buffer = event.buf })
   end,

home/nvim/init.lua

@@ -35,3 +35,5 @@ require("lazy").setup({
     },
   },
 })
+
+vim.keymap.set("n", "<leader>l", "<cmd>Lazy<cr>", { desc = "Manage plugins" })

home/nvim/lua/aucmd.lua

@@ -43,15 +43,6 @@ 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,
 })
 
@@ -114,9 +105,9 @@ vim.api.nvim_create_autocmd({ "BufRead" }, {
   group = vim.api.nvim_create_augroup("add_autocmd_on_buf_enter", { clear = true }),
   pattern = { "*" },
   callback = function(_)
-    -- skip those on some filetypes
     if vim.o.filetype == "gitcommit" then
-      return
+      vim.cmd.normal("1G0") -- discard any position there might be on file
+      return -- skip the usual things
     end
     -- mark as persisted
     vim.api.nvim_create_autocmd({ "InsertEnter", "BufModifiedSet" }, {
@@ -147,13 +138,6 @@ vim.api.nvim_create_autocmd("TermOpen", {
   pattern = "*",
   callback = function(_)
     vim.opt.relativenumber = false
-  end,
-})
-vim.api.nvim_create_autocmd({ "WinEnter", "BufWinEnter", "TermOpen" }, {
-  group = vim.api.nvim_create_augroup("on_term_enter", { clear = true }),
-  callback = function(event)
-    if vim.startswith(vim.api.nvim_buf_get_name(event.buf), "term://") then
-      vim.cmd.startinsert()
-    end
+    vim.cmd.startinsert()
   end,
 })

home/nvim/lua/lsp.lua

@@ -12,10 +12,33 @@ local function root_dir(patterns)
     upward = true,
   })[1])
 end
+
+-- remove defaults
+vim.keymap.del("n", "gO")
+vim.keymap.del("n", "gra")
+vim.keymap.del("n", "gri")
+vim.keymap.del("n", "grn")
+vim.keymap.del("n", "grr")
+
+-- add my own
+vim.keymap.set("n", "<leader>r", vim.lsp.buf.rename, { desc = "lsp: rename symbol" })
+vim.keymap.set("n", "<leader>?", vim.lsp.buf.code_action, { desc = "lsp: run code action" })
+vim.keymap.set("n", "go", vim.lsp.buf.document_symbol, { desc = "lsp: show symbols" })
+vim.keymap.set("n", "gO", vim.lsp.buf.workspace_symbol, { desc = "lsp: show workspacesymbols" })
+vim.keymap.set("n", "gd", vim.lsp.buf.definition, { desc = "lsp: show definition" })
+vim.keymap.set("n", "gD", vim.lsp.buf.type_definition, { desc = "lsp: show type definition" })
+vim.keymap.set("n", "gi", vim.lsp.buf.implementation, { desc = "lsp: show implementations" })
+vim.keymap.set("n", "gr", function()
+  vim.lsp.buf.references({ includeDeclaration = false })
+end, { desc = "lsp: show references" })
+vim.keymap.set("n", "gh", vim.lsp.buf.incoming_calls, { desc = "lsp: show callers" })
+vim.keymap.set("n", "gH", vim.lsp.buf.outgoing_calls, { desc = "lsp: show callees" })
+vim.keymap.set("n", "<leader>sd", vim.diagnostic.setqflist, { desc = "lsp: list diagnostics" })
+
 vim.lsp.config("gopls", {
   cmd = { "gopls" },
   filetypes = { "go", "gomod", "gowork", "gotmpl" },
-  on_attach = function(client, _)
+  on_attach = function(_, _)
     -- modify some semantic tokens
     vim.api.nvim_create_autocmd("LspTokenUpdate", {
       callback = function(args)
@@ -58,11 +81,13 @@ vim.lsp.config("gopls", {
     },
   },
 })
+
 vim.lsp.config("templ", {
   cmd = { "templ", "lsp" },
   filetypes = { "templ" },
   root_dir = root_dir({ "go.mod", "go.sum" }),
 })
+
 vim.lsp.config("javascript", {
   init_options = {
     hostInfo = "neovim",
@@ -79,6 +104,7 @@ vim.lsp.config("javascript", {
   root_dir = root_dir(),
   single_file_support = true,
 })
+
 vim.lsp.config("lua_ls", {
   cmd = { "lua-language-server" },
   filetypes = { "lua" },
@@ -94,22 +120,21 @@ vim.lsp.config("lua_ls", {
     },
   },
 })
+
 vim.lsp.config("nixd", {
   cmd = { "nixd" },
   filetypes = { "nix" },
   single_file_support = true,
   root_dir = root_dir(),
 })
 
-vim.lsp.enable({ "gopls", "nixd", "templ", "javascript", "lua_ls" })
-
-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, "LspRestart", function(_)
-      vim.lsp.stop_client(vim.lsp.get_clients(), true)
-      vim.cmd("edit!")
-    end, { desc = "Restart all active LSP clients" })
-  end,
+vim.lsp.config("typos-lsp", {
+  cmd = { "typos-lsp" },
+  root_dir = root_dir(),
+  single_file_support = true,
+  init_options = {
+    diagnosticSeverity = "hint",
+  },
 })
+
+vim.lsp.enable({ "gopls", "typos-lsp", "nixd", "templ", "javascript", "lua_ls" })

home/nvim/lua/maps.lua

@@ -28,12 +28,16 @@ vim.keymap.set("n", "gl", function()
   local lcount = vim.api.nvim_buf_line_count(0)
   local last_change = vim.api.nvim_buf_get_mark(0, ".")
   if last_change[1] > 0 and last_change[1] <= lcount then
-    pcall(vim.api.nvim_win_set_cursor, 0, last_change)
+    if pcall(vim.api.nvim_win_set_cursor, 0, last_change) then
+      vim.cmd.normal("m'")
+    end
     return
   end
   local last_leave = vim.api.nvim_buf_get_mark(0, '"')
   if last_leave[1] > 0 and last_leave[1] <= lcount then
-    pcall(vim.api.nvim_win_set_cursor, 0, last_leave)
+    if pcall(vim.api.nvim_win_set_cursor, 0, last_leave) then
+      vim.cmd.normal("m'")
+    end
     return
   end
 end, { desc = "jump to last leave or last edit" })
@@ -71,6 +75,8 @@ end, { silent = true, desc = "go to next buffer" })
 vim.keymap.set("n", "<s-tab>", function()
   vim.cmd("bp")
 end, { silent = true, desc = "go to previous buffer" })
+
+-- clear accumulated buffers
 vim.keymap.set("n", "<leader>x", function()
   vim.notify("Clearing buffers...")
   for _, bufnr in ipairs(vim.api.nvim_list_bufs()) do
@@ -108,13 +114,6 @@ vim.keymap.set("n", "dd", function()
   end
 end, { desc = "delete line", expr = true })
 
--- no lsp defaults
-vim.keymap.del("n", "gO")
-vim.keymap.del("n", "gra")
-vim.keymap.del("n", "gri")
-vim.keymap.del("n", "grn")
-vim.keymap.del("n", "grr")
-
 -- open jumplist
 vim.keymap.set("n", "<leader>sj", function()
   local has_snacks = pcall(require, "snacks")
@@ -167,20 +166,7 @@ vim.keymap.set("n", "<leader>sC", function()
   end
 end, { desc = "Changelist" })
 
--- toggle quickfix
+-- toggle quickfix (overwritten by snacks plugin)
 vim.keymap.set("n", "<leader><leader>", function()
   vim.cmd.cwindow()
 end, { desc = "open quickfix" })
-
--- lsp
-vim.keymap.set("n", "<cr>", vim.diagnostic.open_float, { desc = "lsp: open diagnostic" })
-vim.keymap.set("n", "<leader>r", vim.lsp.buf.rename, { desc = "lsp: rename symbol" })
-vim.keymap.set("n", "<leader>?", vim.lsp.buf.code_action, { desc = "lsp: run code action" })
-vim.keymap.set("n", "go", vim.lsp.buf.document_symbol, { desc = "lsp: show symbols" })
-vim.keymap.set("n", "gO", vim.lsp.buf.workspace_symbol, { desc = "lsp: show workspacesymbols" })
-vim.keymap.set("n", "gd", vim.lsp.buf.definition, { desc = "lsp: show definition" })
-vim.keymap.set("n", "gD", vim.lsp.buf.type_definition, { desc = "lsp: show type definition" })
-vim.keymap.set("n", "gi", vim.lsp.buf.implementation, { desc = "lsp: show implementations" })
-vim.keymap.set("n", "<leader>sd", vim.diagnostic.setqflist, { desc = "lsp: list diagnostics" })
-
-vim.keymap.set("n", "<leader>l", "<cmd>Lazy<cr>", { desc = "Manage plugins" })