From f2c3e123c898563305accc50487143fbdf4e970d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Tue, 19 Mar 2024 00:57:08 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(nvim):=20use=20m?= =?UTF-8?q?=20instead=20of=20the=20enter=20key=20as=20a=20defining=20mappi?= =?UTF-8?q?ng=20for=20the=20marks=20extras?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lua/plugins/extras/coding/multicursor.lua | 8 +++---- .../lua/plugins/extras/editor/marks/arrow.lua | 9 ++------ .../plugins/extras/editor/marks/grapple.lua | 22 +++++++++---------- .../extras/editor/marks/harpoon-extended.lua | 16 +++++++------- 4 files changed, 25 insertions(+), 30 deletions(-) diff --git a/.config/nvim/lua/plugins/extras/coding/multicursor.lua b/.config/nvim/lua/plugins/extras/coding/multicursor.lua index 1b92d223..19855c37 100644 --- a/.config/nvim/lua/plugins/extras/coding/multicursor.lua +++ b/.config/nvim/lua/plugins/extras/coding/multicursor.lua @@ -6,10 +6,10 @@ return { "smoka7/hydra.nvim", }, cmd = { "MCstart", "MCvisual", "MCclear", "MCpattern", "MCvisualPattern", "MCunderCursor" }, - -- stylua: ignore - keys = { - { mode = { "v", "n" }, "m", "MCstart", desc = "Multicursor" }, - }, + -- stylua: ignore + keys = { + { mode = { "v", "n" }, "M", "MCstart", desc = "Multicursor" }, + }, opts = { hint_config = { border = "rounded", diff --git a/.config/nvim/lua/plugins/extras/editor/marks/arrow.lua b/.config/nvim/lua/plugins/extras/editor/marks/arrow.lua index 129a0aba..55d0a00b 100644 --- a/.config/nvim/lua/plugins/extras/editor/marks/arrow.lua +++ b/.config/nvim/lua/plugins/extras/editor/marks/arrow.lua @@ -5,14 +5,9 @@ return { opts = { show_icons = true, }, + -- stylua: ignore keys = { - { - "", - function() - require("arrow.ui").openMenu() - end, - desc = "Marks", - }, + { "m", function() require("arrow.ui").openMenu() end, desc = "Marks" }, }, }, { diff --git a/.config/nvim/lua/plugins/extras/editor/marks/grapple.lua b/.config/nvim/lua/plugins/extras/editor/marks/grapple.lua index ed4617f9..b691a358 100644 --- a/.config/nvim/lua/plugins/extras/editor/marks/grapple.lua +++ b/.config/nvim/lua/plugins/extras/editor/marks/grapple.lua @@ -2,19 +2,19 @@ local keys = {} -- stylua: ignore start for i = 1, 9 do - table.insert(keys, { "" .. i, "Grapple select index=" .. i .. "", desc = "File " .. i }) + table.insert(keys, { "m" .. i, "Grapple select index=" .. i .. "", desc = "File " .. i }) end -table.insert(keys, { "a", "Grapple tag", desc = "Add Mark" }) -table.insert(keys, { "", "Grapple toggle_tags", desc = "Marks" }) -table.insert(keys, { "t", "Telescope grapple tags", desc = "Marks (Telescope)" }) -table.insert(keys, { "C", "Grapple reset", desc = "Clear all Marks" }) -table.insert(keys, { "c", "Grapple untag", desc = "Clear current Mark" }) -table.insert(keys, { "s", "Grapple toggle_scopes", desc = "Scopes" }) -table.insert(keys, { "S", "Grapple toggle_loaded", desc = "Loaded Scopes" }) +table.insert(keys, { "ma", "Grapple tag", desc = "Add Mark" }) +table.insert(keys, { "mm", "Grapple toggle_tags", desc = "Marks" }) +table.insert(keys, { "mt", "Telescope grapple tags", desc = "Marks (Telescope)" }) +table.insert(keys, { "mC", "Grapple reset", desc = "Clear all Marks" }) +table.insert(keys, { "mc", "Grapple untag", desc = "Clear current Mark" }) +table.insert(keys, { "ms", "Grapple toggle_scopes", desc = "Scopes" }) +table.insert(keys, { "mS", "Grapple toggle_loaded", desc = "Loaded Scopes" }) -table.insert(keys, { "]", "Grapple cycle forward", desc = "Next Mark" }) -table.insert(keys, { "[", "Grapple cycle backward", desc = "Prev Mark" }) +table.insert(keys, { "]k", "Grapple cycle forward", desc = "Next Mark" }) +table.insert(keys, { "[k", "Grapple cycle backward", desc = "Prev Mark" }) table.insert(keys, { "", "Grapple cycle forward", desc = "Next Mark" }) table.insert(keys, { "", "Grapple cycle backward", desc = "Prev Mark" }) @@ -71,7 +71,7 @@ return { "folke/which-key.nvim", opts = { defaults = { - [""] = { name = "󰛢 marks" }, + ["m"] = { name = "󰛢 marks" }, }, }, }, diff --git a/.config/nvim/lua/plugins/extras/editor/marks/harpoon-extended.lua b/.config/nvim/lua/plugins/extras/editor/marks/harpoon-extended.lua index d0bf617a..a2923ba0 100644 --- a/.config/nvim/lua/plugins/extras/editor/marks/harpoon-extended.lua +++ b/.config/nvim/lua/plugins/extras/editor/marks/harpoon-extended.lua @@ -2,16 +2,16 @@ local keys = {} -- stylua: ignore start for i = 1, 9 do - table.insert(keys, { "" .. i, function() require("harpoon"):list():select(i) end, desc = "File " .. i }) + table.insert(keys, { "m" .. i, function() require("harpoon"):list():select(i) end, desc = "File " .. i }) end -table.insert(keys, { "a", function() require("harpoon"):list():append() end, desc = "Add Mark" }) -table.insert(keys, { "", function() require("harpoon").ui:toggle_quick_menu(require("harpoon"):list()) end, desc = "Marks" }) -table.insert(keys, { "t", "Telescope harpoon marks", desc = "Marks (Telescope)" }) -table.insert(keys, { "c", function() require("harpoon"):list():clear() end, desc = "Clear all Marks" }) +table.insert(keys, { "ma", function() require("harpoon"):list():append() end, desc = "Add Mark" }) +table.insert(keys, { "m", function() require("harpoon").ui:toggle_quick_menu(require("harpoon"):list()) end, desc = "Marks" }) +table.insert(keys, { "mt", "Telescope harpoon marks", desc = "Marks (Telescope)" }) +table.insert(keys, { "mc", function() require("harpoon"):list():clear() end, desc = "Clear all Marks" }) -table.insert(keys, { "]", function() require("harpoon"):list():next() end, desc = "Next Mark" }) -table.insert(keys, { "[", function() require("harpoon"):list():prev() end, desc = "Prev Mark" }) +table.insert(keys, { "]k", function() require("harpoon"):list():next() end, desc = "Next Mark" }) +table.insert(keys, { "[k", function() require("harpoon"):list():prev() end, desc = "Prev Mark" }) table.insert(keys, { "", function() require("harpoon"):list():next() end, desc = "Next Mark" }) table.insert(keys, { "", function() require("harpoon"):list():prev() end, desc = "Prev Mark" }) @@ -84,7 +84,7 @@ return { "folke/which-key.nvim", opts = { defaults = { - [""] = { name = "󰛢 marks" }, + ["m"] = { name = "󰛢 marks" }, }, }, },