Merge branch 'main' into mini.files-windowpicker

lua/lazyvim/plugins/extras/editor/illuminate.lua

@@ -2,6 +2,9 @@
 -- This works with LSP, Treesitter, and regexp matching to find the other
 -- instances.
 return {
+  -- disable snacks words
+  { "snacks.nvim", opts = { words = { enabled = false } } },
+
   {
     "RRethy/vim-illuminate",
     event = "LazyFile",
@@ -53,8 +56,4 @@ return {
       { "[[", desc = "Prev Reference" },
     },
   },
-  {
-    "neovim/nvim-lspconfig",
-    opts = { document_highlight = { enabled = false } },
-  },
 }

lua/lazyvim/plugins/extras/editor/mini-diff.lua

@@ -29,6 +29,29 @@ return {
       },
     },
   },
+  {
+    "mini.diff",
+    opts = function()
+      Snacks.toggle({
+        name = "Mini Diff Signs",
+        get = function()
+          return vim.g.minidiff_disable ~= true
+        end,
+        set = function(state)
+          vim.g.minidiff_disable = not state
+          if state then
+            require("mini.diff").enable(0)
+          else
+            require("mini.diff").disable(0)
+          end
+          -- HACK: redraw to update the signs
+          vim.defer_fn(function()
+            vim.cmd([[redraw!]])
+          end, 200)
+        end,
+      }):map("<leader>uG")
+    end,
+  },
 
   -- lualine integration
   {