From 0586c7a92cc352925e0e60009dd4ec975880748c Mon Sep 17 00:00:00 2001 From: Ariel D'Alessandro Date: Fri, 13 Jan 2023 10:43:22 +0100 Subject: feat: move harpoon to lazy load --- after/plugin/harpoon.lua | 23 ----------------------- after/plugin/hydra.lua | 48 ------------------------------------------------ lua/alpha/harpoon.lua | 44 ++++++++++++++++++++++++++++++++++++++++++++ lua/alpha/plugins.lua | 4 ++++ 4 files changed, 48 insertions(+), 71 deletions(-) delete mode 100644 after/plugin/harpoon.lua delete mode 100644 after/plugin/hydra.lua create mode 100644 lua/alpha/harpoon.lua diff --git a/after/plugin/harpoon.lua b/after/plugin/harpoon.lua deleted file mode 100644 index d80178f..0000000 --- a/after/plugin/harpoon.lua +++ /dev/null @@ -1,23 +0,0 @@ -local ok, harpoon = pcall(require, "harpoon") -if not ok then - return -end - -harpoon.setup {} - -vim.keymap.set('n', 'ss', require("harpoon.ui").toggle_quick_menu, {noremap = true, silent = true, expr = false}) -vim.keymap.set('n', 'sa', require("harpoon.mark").add_file, {noremap = true, silent = true, expr = false}) -vim.keymap.set('n', '1', function () require("harpoon.term").gotoTerminal(1) end, {noremap = true, silent = true, expr = false}) -vim.keymap.set('n', '2', function () require("harpoon.term").gotoTerminal(2) end, {noremap = true, silent = true, expr = false}) -vim.keymap.set('n', '3', function () require("harpoon.term").gotoTerminal(3) end, {noremap = true, silent = true, expr = false}) - -for i = 1, 5 do - vim.keymap.set( - 'n', - string.format("%s", i), - function () - require("harpoon.ui").nav_file(i) - end, - {noremap = true, silent = true, expr = false} - ) -end diff --git a/after/plugin/hydra.lua b/after/plugin/hydra.lua deleted file mode 100644 index 2538f68..0000000 --- a/after/plugin/hydra.lua +++ /dev/null @@ -1,48 +0,0 @@ -local ok, hydra = pcall(require, "hydra") -if not ok then - return -end - --- Windows management, move and resize --- hydra({ --- name = "windows", --- mode = "n", --- body = "", --- heads = { --- { "l", "l" }, --- { "h", "h" }, --- { "j", "j" }, --- { "k", "k" }, --- { "q", "q" }, --- { "o", "o" }, --- { "L", "2>" }, --- { "H", "2<" }, --- { "J", "2-" }, --- { "K", "2+" }, --- -- { "", "L" }, --- -- { "", "H" }, --- -- { "", "J" }, --- -- { "", "K" }, --- { "=", "=" }, --- }, --- }) - --- want a way to run make commands --- Make commands runs good but the output is not good --- like up I like that is done and good --- hydra({ --- name = "make", --- mode = "n", --- body = "", --- config = { --- color = "blue", --- }, --- heads = { --- { "t", function() vim.cmd("vsplit term://make test") end }, --- { "v", function() --- vim.cmd('vert new') --- vim.fn.termopen("make vars") --- vim.cmd('startinsert') --- end, {exit = true} }, --- }, --- }) diff --git a/lua/alpha/harpoon.lua b/lua/alpha/harpoon.lua new file mode 100644 index 0000000..958489b --- /dev/null +++ b/lua/alpha/harpoon.lua @@ -0,0 +1,44 @@ +local M = {}; + +-- changing this values will require re-compile packer +local terms = vim.g.harpoon_terms or 3 +local quick_binds = vim.g.harpoon_quick_binds or 5 + +M.keymaps = { + "ss", + "sa", +} + +for i = 1, terms do + table.insert(M.keymaps, string.format("%s", i)) +end + +for i = 1, quick_binds do + table.insert(M.keymaps, string.format("%s", i)) +end + +M.setup = function() + require('harpoon').setup({}) + + vim.keymap.set('n', 'ss', require("harpoon.ui").toggle_quick_menu, + { noremap = true, silent = true, expr = false }) + vim.keymap.set('n', 'sa', require("harpoon.mark").add_file, { noremap = true, silent = true, expr = false }) + + for i = 1, terms do + vim.keymap.set('n', string.format('%s', i), function() require("harpoon.term").gotoTerminal(1) end, + { noremap = true, silent = true, expr = false }) + end + + for i = 1, quick_binds do + vim.keymap.set( + 'n', + string.format("%s", i), + function() + require("harpoon.ui").nav_file(i) + end, + { noremap = true, silent = true, expr = false } + ) + end +end + +return M diff --git a/lua/alpha/plugins.lua b/lua/alpha/plugins.lua index d0e4c7a..7d01f99 100644 --- a/lua/alpha/plugins.lua +++ b/lua/alpha/plugins.lua @@ -65,6 +65,10 @@ return require("packer").startup(function(use) "nvim-lua/plenary.nvim", "nvim-lua/popup.nvim", }, + keys = require('alpha.harpoon').keymaps, + config = function () + require('alpha.harpoon').setup() + end }) use({ -- cgit v1.2.3