feat: flash.nvim

nix/neovim-overlay.nix

@@ -51,6 +51,8 @@ with final.pkgs.lib; let
 
     # Editor
     neo-tree-nvim
+    grug-far-nvim
+    flash-nvim
   ];
 
   extraPackages = with pkgs; [

nvim/lua/lib/marleyvim/init.lua

@@ -1,11 +0,0 @@
-local M = {}
-
----@param prefix string The string to prefix to all req calls.
-function M.localRequire(prefix)
-  ---@param mod string The module to require.
-  return function(mod)
-    return require(prefix .. '.' .. mod)
-  end
-end
-
-return M

nvim/lua/plugins/colorscheme/init.lua

@@ -1,4 +1,4 @@
-local req = require('lib.marleyvim').localRequire('plugins.colorscheme')
+local req = MarleyVim.local_require('plugins.colorscheme')
 
 return {
   req('rose-pine'),

nvim/lua/plugins/editor/flash-nvim.lua

@@ -0,0 +1,47 @@
+return {
+  'flash.nvim',
+  event = 'DeferredUIEnter',
+  keys = {
+    {
+      's',
+      function()
+        require('flash').jump()
+      end,
+      mode = { 'n', 'x', 'o' },
+      desc = 'Flash',
+    },
+    {
+      'S',
+      function()
+        require('flash').treesitter()
+      end,
+      mode = { 'n', 'x', 'o' },
+      desc = 'Flash (treesitter)',
+    },
+    {
+      'r',
+      function()
+        require('flash').remote()
+      end,
+      desc = 'Remote flash',
+    },
+    {
+      'R',
+      function()
+        require('flash').treesitter_search()
+      end,
+      mode = { 'x', 'o' },
+      desc = 'Treesitter search',
+    },
+    {
+      '<C-s>',
+      function()
+        require('flash').toggle()
+      end,
+      'Toggle flash search',
+    },
+  },
+  after = function()
+    require('flash').setup({})
+  end,
+}

nvim/lua/plugins/editor/grug-far-nvim.lua

@@ -0,0 +1,25 @@
+return {
+  'grug-far.nvim',
+  cmd = 'GrugFar',
+  keys = {
+    {
+      '<LEADER>sr',
+      function()
+        local grug = require('grug-far')
+        local ext = vim.bo.buftype == '' and vim.fn.expand('%:e')
+
+        grug.open({
+          transient = true,
+          prefills = {
+            filesFilter = ext and ext ~= '' and '*.' .. ext or nil,
+          },
+        })
+      end,
+      mode = { 'n', 'v' },
+      desc = 'Search and replace',
+    },
+  },
+  after = function()
+    require('grug-far').setup({ headerMaxWidth = 80 })
+  end,
+}

nvim/lua/plugins/editor/init.lua

@@ -1,5 +1,7 @@
-local req = require('lib.marleyvim').localRequire('plugins.editor')
+local req = MarleyVim.local_require('plugins.editor')
 
 return {
+  req('flash-nvim'),
+  req('grug-far-nvim'),
   req('neo-tree-nvim'),
 }

nvim/lua/plugins/ui/init.lua

@@ -1,4 +1,4 @@
-local req = require('lib.marleyvim').localRequire('plugins.ui')
+local req = MarleyVim.local_require('plugins.ui')
 
 return {
   req('alpha-nvim'),

nvim/lua/plugins/util/init.lua

@@ -1,4 +1,4 @@
-local req = require('lib.marleyvim').localRequire('plugins.util')
+local req = MarleyVim.local_require('plugins.util')
 
 return {
   req('nui-nvim'),

nvim/queries/lua/highlights.scm

@@ -0,0 +1,7 @@
+;; extends
+
+((identifier) @namespace.builtin
+  (#eq? @namespace.builtin "vim"))
+
+((identifier) @namespace.builtin
+  (#eq? @namespace.builtin "MarleyVim"))