2 different vim versions

19 files changed, 76 insertions, 55 deletions

diff --git a/arch/nvim/.config/nvim/.stylua.toml b/arch/bigvim/.config/bigvim/.stylua.toml
index e55efd5..e55efd5 100644
--- a/arch/nvim/.config/nvim/.stylua.toml
+++ b/arch/bigvim/.config/bigvim/.stylua.toml
diff --git a/arch/nvim/.config/nvim/init.lua b/arch/bigvim/.config/bigvim/init.lua
index fb4cadd..fb4cadd 100644
--- a/arch/nvim/.config/nvim/init.lua
+++ b/arch/bigvim/.config/bigvim/init.lua
diff --git a/arch/nvim/.config/nvim/lazy-lock.json b/arch/bigvim/.config/bigvim/lazy-lock.json
index fdd24c3..fdd24c3 100644
--- a/arch/nvim/.config/nvim/lazy-lock.json
+++ b/arch/bigvim/.config/bigvim/lazy-lock.json
diff --git a/arch/nvim/.config/nvim/lua/keymaps.lua b/arch/bigvim/.config/bigvim/lua/keymaps.lua
index 2a38a95..2a38a95 100644
--- a/arch/nvim/.config/nvim/lua/keymaps.lua
+++ b/arch/bigvim/.config/bigvim/lua/keymaps.lua
diff --git a/arch/nvim/.config/nvim/lua/options.lua b/arch/bigvim/.config/bigvim/lua/options.lua
index 6d53af3..6d53af3 100644
--- a/arch/nvim/.config/nvim/lua/options.lua
+++ b/arch/bigvim/.config/bigvim/lua/options.lua
diff --git a/arch/nvim/.config/nvim/lua/plugins/colorscheme.lua b/arch/bigvim/.config/bigvim/lua/plugins/colorscheme.lua
index 2e25d6c..2e25d6c 100644
--- a/arch/nvim/.config/nvim/lua/plugins/colorscheme.lua
+++ b/arch/bigvim/.config/bigvim/lua/plugins/colorscheme.lua
diff --git a/arch/nvim/.config/nvim/lua/plugins/completion.lua b/arch/bigvim/.config/bigvim/lua/plugins/completion.lua
index 8fe2e26..8fe2e26 100644
--- a/arch/nvim/.config/nvim/lua/plugins/completion.lua
+++ b/arch/bigvim/.config/bigvim/lua/plugins/completion.lua
diff --git a/arch/nvim/.config/nvim/lua/plugins/editor.lua b/arch/bigvim/.config/bigvim/lua/plugins/editor.lua
index a6ec0e0..a6ec0e0 100644
--- a/arch/nvim/.config/nvim/lua/plugins/editor.lua
+++ b/arch/bigvim/.config/bigvim/lua/plugins/editor.lua
diff --git a/arch/nvim/.config/nvim/lua/plugins/extras.lua b/arch/bigvim/.config/bigvim/lua/plugins/extras.lua
index 21ef0f8..21ef0f8 100644
--- a/arch/nvim/.config/nvim/lua/plugins/extras.lua
+++ b/arch/bigvim/.config/bigvim/lua/plugins/extras.lua
diff --git a/arch/nvim/.config/nvim/lua/plugins/formatting.lua b/arch/bigvim/.config/bigvim/lua/plugins/formatting.lua
index 4367c59..4367c59 100644
--- a/arch/nvim/.config/nvim/lua/plugins/formatting.lua
+++ b/arch/bigvim/.config/bigvim/lua/plugins/formatting.lua
diff --git a/arch/nvim/.config/nvim/lua/plugins/fzf.lua b/arch/bigvim/.config/bigvim/lua/plugins/fzf.lua
index 9a34c9a..9a34c9a 100644
--- a/arch/nvim/.config/nvim/lua/plugins/fzf.lua
+++ b/arch/bigvim/.config/bigvim/lua/plugins/fzf.lua
diff --git a/arch/nvim/.config/nvim/lua/plugins/linting.lua b/arch/bigvim/.config/bigvim/lua/plugins/linting.lua
index bbbeaa7..bbbeaa7 100644
--- a/arch/nvim/.config/nvim/lua/plugins/linting.lua
+++ b/arch/bigvim/.config/bigvim/lua/plugins/linting.lua
diff --git a/arch/nvim/.config/nvim/lua/plugins/lsp.lua b/arch/bigvim/.config/bigvim/lua/plugins/lsp.lua
index 76566d1..76566d1 100644
--- a/arch/nvim/.config/nvim/lua/plugins/lsp.lua
+++ b/arch/bigvim/.config/bigvim/lua/plugins/lsp.lua
diff --git a/arch/nvim/.config/nvim/lua/plugins/nav.lua b/arch/bigvim/.config/bigvim/lua/plugins/nav.lua
index 827da07..827da07 100644
--- a/arch/nvim/.config/nvim/lua/plugins/nav.lua
+++ b/arch/bigvim/.config/bigvim/lua/plugins/nav.lua
diff --git a/arch/nvim/.config/nvim/lua/plugins/treesitter.lua b/arch/bigvim/.config/bigvim/lua/plugins/treesitter.lua
index 348eaba..348eaba 100644
--- a/arch/nvim/.config/nvim/lua/plugins/treesitter.lua
+++ b/arch/bigvim/.config/bigvim/lua/plugins/treesitter.lua
diff --git a/arch/nvim/.config/nvim/lua/plugins/ui.lua b/arch/bigvim/.config/bigvim/lua/plugins/ui.lua
index 35a22de..35a22de 100644
--- a/arch/nvim/.config/nvim/lua/plugins/ui.lua
+++ b/arch/bigvim/.config/bigvim/lua/plugins/ui.lua
diff --git a/arch/nvim/.config/nvim/lua/plugins/whichkey.lua b/arch/bigvim/.config/bigvim/lua/plugins/whichkey.lua
index 97e8b19..97e8b19 100644
--- a/arch/nvim/.config/nvim/lua/plugins/whichkey.lua
+++ b/arch/bigvim/.config/bigvim/lua/plugins/whichkey.lua
diff --git a/arch/fish/.config/fish/functions/vi.fish b/arch/fish/.config/fish/functions/vi.fish
new file mode 100644
index 0000000..e362555
--- /dev/null
+++ b/arch/fish/.config/fish/functions/vi.fish
@@ -0,0 +1,3 @@
+function vi --wraps=nvim --wraps=vims --wraps=vim --description 'alias vi vims'
+    vims $argv
+end
diff --git a/arch/lightvim/.config/lightvim/lua/plugins.lua b/arch/lightvim/.config/lightvim/lua/plugins.lua
index d9b563b..2f737b2 100644
--- a/arch/lightvim/.config/lightvim/lua/plugins.lua
+++ b/arch/lightvim/.config/lightvim/lua/plugins.lua
@@ -102,64 +102,82 @@ return {
         config = function()
             local mc = require("multicursor-nvim")
             mc.setup()
-            local set = vim.keymap.set
             local nv = { "n", "v" }
 
-            -- Adding cursors (Alt+Shift+arrow — Ctrl+Shift+arrow is move-line)
-            set(nv, "<M-S-Down>",  function() mc.lineAddCursor(1) end,  { desc = "Add cursor down" })
-            set(nv, "<M-S-Up>",    function() mc.lineAddCursor(-1) end, { desc = "Add cursor up" })
-
-            -- Skipping (advance without dropping a cursor)
-            set(nv, "<leader>m<Down>", function() mc.lineSkipCursor(1) end,  { desc = "Skip line down" })
-            set(nv, "<leader>m<Up>",   function() mc.lineSkipCursor(-1) end, { desc = "Skip line up" })
-
-            -- Match-based add / skip
-            set(nv, "<leader>mn",  function() mc.matchAddCursor(1) end,  { desc = "Add cursor: next match" })
-            set(nv, "<leader>mp",  function() mc.matchAddCursor(-1) end, { desc = "Add cursor: prev match" })
-            set(nv, "<leader>ms",  function() mc.matchSkipCursor(1) end, { desc = "Skip match, advance" })
-            set(nv, "<leader>mA",  mc.matchAllAddCursors,                { desc = "Cursors for all matches" })
-
-            -- Repeat keys: ;/, add or skip when cursors active; default f/F/t/T otherwise
-            set("n", ";", function()
-                if mc.hasCursors() then mc.matchAddCursor(1) else vim.cmd("normal! ;") end
-            end, { desc = "Repeat f/F/t/T  ·  next-match cursor when active" })
-            set("n", ",", function()
-                if mc.hasCursors() then mc.matchSkipCursor(1) else vim.cmd("normal! ,") end
-            end, { desc = "Reverse f/F/t/T  ·  skip-match when active" })
-
-            -- Manual toggle / delete
-            set(nv, "<leader>mt",  mc.toggleCursor,                      { desc = "Toggle cursor here" })
-            set(nv, "<leader>mx",  mc.deleteCursor,                      { desc = "Delete cursor under main" })
-
-            -- Rotate / jump main focus through cursor list (arrows)
-            set(nv, "<leader>m<Right>", mc.nextCursor,                   { desc = "Rotate to next cursor" })
-            set(nv, "<leader>m<Left>",  mc.prevCursor,                   { desc = "Rotate to prev cursor" })
-            set(nv, "<leader>mF",       mc.firstCursor,                  { desc = "Jump to first cursor" })
-            set(nv, "<leader>mL",       mc.lastCursor,                   { desc = "Jump to last cursor" })
-
-            -- Bulk ops
-            set(nv, "<leader>m=",  mc.alignCursors,                     { desc = "Align cursors" })
-            set(nv, "<leader>mu",  mc.restoreCursors,                   { desc = "Restore last cursors" })
-            set(nv, "<leader>md",  function()
-                if mc.cursorsEnabled() then mc.disableCursors() else mc.enableCursors() end
-            end, { desc = "Freeze/unfreeze cursors" })
-            set(nv, "<leader>m.",  function() mc.transposeCursors(1) end,  { desc = "Transpose forward" })
-            set(nv, "<leader>m,",  function() mc.transposeCursors(-1) end, { desc = "Transpose back" })
-
-            -- Pattern-based (visual mode — needs a selection)
-            set("x", "<leader>m/", mc.matchCursors,                     { desc = "Cursors at regex matches" })
-            set("x", "<leader>mS", mc.splitCursors,                     { desc = "Split selection by pattern" })
-
-            -- Esc: re-enable / clear / nohlsearch
-            set("n", "<esc>", function()
-                if not mc.cursorsEnabled() then
-                    mc.enableCursors()
-                elseif mc.hasCursors() then
-                    mc.clearCursors()
-                else
-                    vim.cmd("nohlsearch")
+            -- Bind everything via a function so we can re-apply per-buffer
+            -- (oil buffers set their own buffer-local maps that would otherwise
+            --  shadow these globals).
+            local function bind(buf)
+                local opts_base = buf and { buffer = buf } or {}
+                local function set(mode, lhs, rhs, opts)
+                    local o = vim.tbl_extend("force", opts_base, opts or {})
+                    vim.keymap.set(mode, lhs, rhs, o)
                 end
-            end)
+
+                -- Adding cursors (Alt+Shift+arrow — Ctrl+Shift+arrow is move-line)
+                set(nv, "<M-S-Down>",  function() mc.lineAddCursor(1) end,  { desc = "Add cursor down" })
+                set(nv, "<M-S-Up>",    function() mc.lineAddCursor(-1) end, { desc = "Add cursor up" })
+
+                -- Skipping (advance without dropping a cursor)
+                set(nv, "<leader>m<Down>", function() mc.lineSkipCursor(1) end,  { desc = "Skip line down" })
+                set(nv, "<leader>m<Up>",   function() mc.lineSkipCursor(-1) end, { desc = "Skip line up" })
+
+                -- Match-based add / skip
+                set(nv, "<leader>mn",  function() mc.matchAddCursor(1) end,  { desc = "Add cursor: next match" })
+                set(nv, "<leader>mp",  function() mc.matchAddCursor(-1) end, { desc = "Add cursor: prev match" })
+                set(nv, "<leader>ms",  function() mc.matchSkipCursor(1) end, { desc = "Skip match, advance" })
+                set(nv, "<leader>mA",  mc.matchAllAddCursors,                { desc = "Cursors for all matches" })
+
+                -- Repeat keys: ;/, add or skip when cursors active; default f/F/t/T otherwise
+                set("n", ";", function()
+                    if mc.hasCursors() then mc.matchAddCursor(1) else vim.cmd("normal! ;") end
+                end, { desc = "Repeat f/F/t/T  ·  next-match cursor when active" })
+                set("n", ",", function()
+                    if mc.hasCursors() then mc.matchSkipCursor(1) else vim.cmd("normal! ,") end
+                end, { desc = "Reverse f/F/t/T  ·  skip-match when active" })
+
+                -- Manual toggle / delete
+                set(nv, "<leader>mt",  mc.toggleCursor,                      { desc = "Toggle cursor here" })
+                set(nv, "<leader>mx",  mc.deleteCursor,                      { desc = "Delete cursor under main" })
+
+                -- Rotate / jump main focus through cursor list (arrows)
+                set(nv, "<leader>m<Right>", mc.nextCursor,                   { desc = "Rotate to next cursor" })
+                set(nv, "<leader>m<Left>",  mc.prevCursor,                   { desc = "Rotate to prev cursor" })
+                set(nv, "<leader>mF",       mc.firstCursor,                  { desc = "Jump to first cursor" })
+                set(nv, "<leader>mL",       mc.lastCursor,                   { desc = "Jump to last cursor" })
+
+                -- Bulk ops
+                set(nv, "<leader>m=",  mc.alignCursors,                     { desc = "Align cursors" })
+                set(nv, "<leader>mu",  mc.restoreCursors,                   { desc = "Restore last cursors" })
+                set(nv, "<leader>md",  function()
+                    if mc.cursorsEnabled() then mc.disableCursors() else mc.enableCursors() end
+                end, { desc = "Freeze/unfreeze cursors" })
+                set(nv, "<leader>m.",  function() mc.transposeCursors(1) end,  { desc = "Transpose forward" })
+                set(nv, "<leader>m,",  function() mc.transposeCursors(-1) end, { desc = "Transpose back" })
+
+                -- Pattern-based (visual mode — needs a selection)
+                set("x", "<leader>m/", mc.matchCursors,                     { desc = "Cursors at regex matches" })
+                set("x", "<leader>mS", mc.splitCursors,                     { desc = "Split selection by pattern" })
+
+                -- Esc: re-enable / clear / nohlsearch
+                set("n", "<esc>", function()
+                    if not mc.cursorsEnabled() then
+                        mc.enableCursors()
+                    elseif mc.hasCursors() then
+                        mc.clearCursors()
+                    else
+                        vim.cmd("nohlsearch")
+                    end
+                end)
+            end
+
+            bind(nil)
+
+            -- Re-bind buffer-local for oil so its keymaps don't shadow ours.
+            vim.api.nvim_create_autocmd("FileType", {
+                pattern = "oil",
+                callback = function(args) bind(args.buf) end,
+            })
         end,
     },