up

profiles/base/home-manager/neovim/default.nix

@@ -4,14 +4,13 @@
     ./mappings.nix
     ./options.nix
     ./plugins/conform.nix
+    ./plugins/grug-far.nix
     ./plugins/lazygit.nix
     ./plugins/lsp.nix
     ./plugins/mini.nix
     ./plugins/treesitter.nix
   ];
 
-  home.shellAliases.v = "nvim";
-
   programs.nixvim = {
     enable = true;
     defaultEditor = true;

profiles/base/home-manager/neovim/mappings.nix

@@ -13,6 +13,12 @@
       action = ":lua require('mini.files').open(vim.api.nvim_buf_get_name(0))<CR>";
       options.desc = "File directory";
     }
+    {
+      mode = "n";
+      key = "<leader>er";
+      action = ":lua require('grug-far').open()<CR>";
+      options.desc = "Search and replace";
+    }
     # f - find
     {
       mode = "n";
@@ -62,6 +68,12 @@
       action = ":Pick files<CR>";
       options.desc = "Search files";
     }
+    {
+      mode = "n";
+      key = "<leader>fg";
+      action = ":Pick grep_live<CR>";
+      options.desc = "Grep";
+    }
     {
       mode = "n";
       key = "<leader>fr";
@@ -88,19 +100,61 @@
       options.desc = "Lazygit";
     }
     # l - lsp/formatter
+    {
+      mode = "n";
+      key = "<leader>la";
+      action = ":lua vim.lsp.buf.code_action()<CR>";
+      options.desc = "Actions";
+    }
+    {
+      mode = "n";
+      key = "<leader>ld";
+      action = ":lua vim.diagnostic.open_float()<CR>";
+      options.desc = "Diagnostics popup";
+    }
     {
       mode = "n";
       key = "<leader>lf";
       action = ":lua require('conform').format({ lsp_fallback = true })<CR>";
       options.desc = "Format";
     }
-    # next
     {
       mode = "n";
-      key = "<leader>/";
-      action = ":Pick grep_live<CR>";
-      options.desc = "Grep";
+      key = "<leader>li";
+      action = ":lua vim.lsp.buf.hover()<CR>";
+      options.desc = "Information";
     }
+    {
+      mode = "n";
+      key = "<leader>lj";
+      action = ":lua vim.diagnostic.goto_next()<CR>";
+      options.desc = "Next diagnostic";
+    }
+    {
+      mode = "n";
+      key = "<leader>lk";
+      action = ":lua vim.diagnostic.goto_prev()<CR>";
+      options.desc = "Prev diagnostic";
+    }
+    {
+      mode = "n";
+      key = "<leader>lr";
+      action = ":lua vim.lsp.buf.rename()<CR>";
+      options.desc = "Rename";
+    }
+    {
+      mode = "n";
+      key = "<leader>lR";
+      action = ":lua vim.lsp.buf.references()<CR>";
+      options.desc = "References";
+    }
+    {
+      mode = "n";
+      key = "<leader>ls";
+      action = ":lua vim.lsp.buf.definition()<CR>";
+      options.desc = "Source definition";
+    }
+    # other
     {
       mode = "n";
       key = "sj";

profiles/base/home-manager/neovim/options.nix

@@ -1,18 +1,15 @@
 {
   programs.nixvim = {
-    globalOpts = {
-      expandtab = true;
-      shiftwidth = 2;
-      relativenumber = true;
-      mouse = "";
-      # foldmethod = "expr";
-      # foldexpr = "nvim_treesitter#foldexpr()";
-    };
     globals = {
-      clipboard = "osc52";
+      # clipboard = "osc52";
     };
     opts = {
+      clipboard = "unnamedplus";
+      expandtab = true;
       ignorecase = true;
+      mouse = "";
+      relativenumber = true;
+      shiftwidth = 2;
       smartcase = true;
     };
   };

profiles/base/home-manager/neovim/plugins/grug-far.nix

@@ -0,0 +1,7 @@
+{
+  programs.nixvim.plugins = {
+    grug-far = {
+      enable = true;
+    };
+  };
+}

profiles/base/home-manager/neovim/plugins/mini.nix

@@ -2,18 +2,13 @@
   programs.nixvim.plugins.mini = {
     enable = true;
     modules = {
-      jump = {};
-      files = {};
-      jump2d = {
-        settings = {
-          spotter.__raw = "require('mini.jump2d').gen_spotter.pattern('[^%s%p]+')";
-          labels = "asdfghjkl";
-          view = {
-            dim = true;
-            n_steps_ahead = 2;
-          };
+      ai = {
+        custom_textobjects = {
+          B.__raw = "require('mini.extra').gen_ai_spec.buffer()";
+          F.__raw = "require('mini.ai').gen_spec.treesitter({ a = '@function.outer', i = '@function.inner' })";
         };
       };
+      align = {};
       basics = {
         options = {
           basic = true;
@@ -26,49 +21,15 @@
           basic = true;
         };
       };
-      icons = {};
-      statusline = {};
-      extra = {};
-      ai = {
-        custom_textobjects = {
-          B.__raw = "require('mini.extra').gen_ai_spec.buffer()";
-          F.__raw = "require('mini.ai').gen_spec.treesitter({ a = '@function.outer', i = '@function.inner' })";
-        };
-      };
-      align = {};
-      diff = {};
-      git = {};
       bracketed = {};
-      comment = {};
-      completion = {
-        lsp_completion = {
-          source_func = "omnifunc";
-        };
-      };
-      indentscope = {};
-      move = {};
-      starter = {};
-      pairs = {};
-      trailspace = {};
-      visits = {};
-      pick = {};
-      surround = {};
       clue = {
         clues.__raw = ''
           {
-            { mode = 'n', keys = '<Leader>b', desc = '+Buffer' },
-            { mode = 'n', keys = '<Leader>e', desc = '+Explore' },
+            { mode = 'n', keys = '<Leader>e', desc = '+Explore/+Edit' },
             { mode = 'n', keys = '<Leader>f', desc = '+Find' },
             { mode = 'n', keys = '<Leader>g', desc = '+Git' },
             { mode = 'n', keys = '<Leader>l', desc = '+LSP' },
-            { mode = 'n', keys = '<Leader>L', desc = '+Lua/Log' },
-            { mode = 'n', keys = '<Leader>o', desc = '+Other' },
-            { mode = 'n', keys = '<Leader>r', desc = '+R' },
-            { mode = 'n', keys = '<Leader>t', desc = '+Terminal/Minitest' },
-            { mode = 'n', keys = '<Leader>T', desc = '+Test' },
-            { mode = 'n', keys = '<Leader>v', desc = '+Visits' },
             { mode = 'x', keys = '<Leader>l', desc = '+LSP' },
-            { mode = 'x', keys = '<Leader>r', desc = '+R' },
             require("mini.clue").gen_clues.builtin_completion(),
             require("mini.clue").gen_clues.g(),
             require("mini.clue").gen_clues.marks(),
@@ -161,6 +122,37 @@
           }
         ];
       };
+      comment = {};
+      completion = {
+        lsp_completion = {
+          source_func = "omnifunc";
+        };
+      };
+      diff = {};
+      extra = {};
+      files = {};
+      git = {};
+      icons = {};
+      indentscope = {};
+      jump = {};
+      jump2d = {
+        settings = {
+          spotter.__raw = "require('mini.jump2d').gen_spotter.pattern('[^%s%p]+')";
+          labels = "asdfghjkl";
+          view = {
+            dim = true;
+            n_steps_ahead = 2;
+          };
+        };
+      };
+      move = {};
+      pairs = {};
+      pick = {};
+      starter = {};
+      statusline = {};
+      surround = {};
+      trailspace = {};
+      visits = {};
     };
   };
 }