From 880ce25631a0351635cdf071748596311f3ebe1e Mon Sep 17 00:00:00 2001 From: S4NKALP Date: Fri, 8 Mar 2024 21:27:58 +0545 Subject: [PATCH] refactor(nvim): harpoon and arrow extra are now identified as marks --- .../nvim/lua/plugins/extras/editor/arrow.lua | 33 +++++++++++++++++-- .../lua/plugins/extras/editor/harpoon.lua | 26 +++++++-------- config/nvim/lua/plugins/lspconfig.lua | 3 -- 3 files changed, 44 insertions(+), 18 deletions(-) diff --git a/config/nvim/lua/plugins/extras/editor/arrow.lua b/config/nvim/lua/plugins/extras/editor/arrow.lua index 02af92c4..a6b119db 100644 --- a/config/nvim/lua/plugins/extras/editor/arrow.lua +++ b/config/nvim/lua/plugins/extras/editor/arrow.lua @@ -7,11 +7,11 @@ return { }, keys = { { - "h", + "", function() require("arrow.ui").openMenu() end, - desc = "Harpoon", + desc = "Marks", }, }, }, @@ -21,4 +21,33 @@ return { table.insert(opts.sections.lualine_c, require("arrow.statusline").text_for_statusline_with_icons()) end, }, + { + "goolord/alpha-nvim", + optional = true, + opts = function(_, dashboard) + -- stylua: ignore + local button = dashboard.button("m", "󱌧 " .. " Marks", function() require("arrow.ui").openMenu() end) + button.opts.hl = "AlphaButtons" + button.opts.hl_shortcut = "AlphaShortcut" + table.insert(dashboard.section.buttons.val, 5, button) + end, + }, + { + "nvimdev/dashboard-nvim", + optional = true, + opts = function(_, opts) + -- stylua: ignore + local arrow = { + action = function() require("arrow.ui").openMenu() end, + desc = " Marks", + icon = "󱌧 ", + key = "m", + } + + arrow.desc = arrow.desc .. string.rep(" ", 43 - #arrow.desc) + arrow.key_format = " %s" + + table.insert(opts.config.center, 5, arrow) + end, + }, } diff --git a/config/nvim/lua/plugins/extras/editor/harpoon.lua b/config/nvim/lua/plugins/extras/editor/harpoon.lua index 16ee128b..531de938 100644 --- a/config/nvim/lua/plugins/extras/editor/harpoon.lua +++ b/config/nvim/lua/plugins/extras/editor/harpoon.lua @@ -2,19 +2,19 @@ local keys = {} -- stylua: ignore start for i = 1, 9 do - table.insert(keys, { "h" .. i, function() require("harpoon"):list():select(i) end, desc = "File " .. i }) + table.insert(keys, { "" .. i, function() require("harpoon"):list():select(i) end, desc = "File " .. i }) end -table.insert(keys, { "ha", function() require("harpoon"):list():append() end, desc = "Add Mark" }) -table.insert(keys, { "hh", function() require("harpoon").ui:toggle_quick_menu(require("harpoon"):list()) end, desc = "Menu" }) -table.insert(keys, { "hf", "Telescope harpoon marks", desc = "Files (Telescope)" }) -table.insert(keys, { "hc", function() require("harpoon"):list():clear() end, desc = "Clear all Files" }) +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 = "Files (Telescope)" }) +table.insert(keys, { "c", function() require("harpoon"):list():clear() end, desc = "Clear all Files" }) -table.insert(keys, { "]H", function() require("harpoon"):list():next() end, desc = "Next Harpoon File" }) -table.insert(keys, { "[H", function() require("harpoon"):list():prev() end, desc = "Prev Harpoon File" }) +table.insert(keys, { "]", function() require("harpoon"):list():next() end, desc = "Next Mark File" }) +table.insert(keys, { "[", function() require("harpoon"):list():prev() end, desc = "Prev Mark File" }) -table.insert(keys, { "", function() require("harpoon"):list():next() end, desc = "Next Harpoon File" }) -table.insert(keys, { "", function() require("harpoon"):list():prev() end, desc = "Prev Harpoon File" }) +table.insert(keys, { "", function() require("harpoon"):list():next() end, desc = "Next Mark File" }) +table.insert(keys, { "", function() require("harpoon"):list():prev() end, desc = "Prev Mark File" }) -- stylua: ignore end return { @@ -55,7 +55,7 @@ return { "goolord/alpha-nvim", optional = true, opts = function(_, dashboard) - local button = dashboard.button("h", "󱌧 " .. " Harpoon", "Telescope harpoon marks") + local button = dashboard.button("m", "󱌧 " .. " Marks", "Telescope harpoon marks") button.opts.hl = "AlphaButtons" button.opts.hl_shortcut = "AlphaShortcut" table.insert(dashboard.section.buttons.val, 5, button) @@ -67,9 +67,9 @@ return { opts = function(_, opts) local harpoon = { action = "Telescope harpoon marks", - desc = " Harpoon", + desc = " Marks", icon = "󱌧 ", - key = "h", + key = "m", } harpoon.desc = harpoon.desc .. string.rep(" ", 43 - #harpoon.desc) @@ -82,7 +82,7 @@ return { "folke/which-key.nvim", opts = { defaults = { - ["h"] = { name = "󱌧 harpoon" }, + [""] = { name = "󱌧 marks" }, }, }, }, diff --git a/config/nvim/lua/plugins/lspconfig.lua b/config/nvim/lua/plugins/lspconfig.lua index 12bda8fe..db57649d 100644 --- a/config/nvim/lua/plugins/lspconfig.lua +++ b/config/nvim/lua/plugins/lspconfig.lua @@ -16,9 +16,6 @@ return { keys[#keys + 1] = { "clr", function() vim.lsp.buf.remove_workspace_folder() end, desc = "Remove workspace" } keys[#keys + 1] = { "cla", function() vim.lsp.buf.add_workspace_folder() end, desc = "Add workspace" } -- stylua: ignore end - - keys[#keys + 1] = { "clh", vim.lsp.codelens.run, desc = "Run Code Lens" } - keys[#keys + 1] = { "cld", vim.lsp.codelens.refresh, desc = "Refresh Code Lens" } end, opts = { diagnostics = {