summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAotrix <[email protected]>2024-02-18 21:49:29 +0100
committerAotrix <[email protected]>2024-02-18 21:49:29 +0100
commit3bd0fd13998b49cc564e57fb8fd10b11b1a20af6 (patch)
tree98ce30314cdb715b1658e8818f74c22c1d0bea84
parent70512739997072949ce847f3dbdbc6fb2e4fa535 (diff)
he
-rw-r--r--init.lua33
-rw-r--r--lazy-lock.json1
-rw-r--r--lua/harpoon/harpoon.lua0
-rw-r--r--lua/nvim_settings/remap.lua9
4 files changed, 29 insertions, 14 deletions
diff --git a/init.lua b/init.lua
index 877210d..c2644e9 100644
--- a/init.lua
+++ b/init.lua
@@ -60,22 +60,29 @@ require('lazy').setup({
},
{
- 'nvim-lualine/lualine.nvim',
- -- dependencies = {'nvim-tree/nvim-web-devicons'},
- config = function()
- require('statusline/statusline')
- end
+ 'nvim-lualine/lualine.nvim',
+ -- dependencies = {'nvim-tree/nvim-web-devicons'},
+ config = function()
+ require('statusline/statusline')
+ end
},
-- Telescope
{
- 'nvim-telescope/telescope.nvim', tag = '0.1.5',
--- or , branch = '0.1.x',
- dependencies = { 'nvim-lua/plenary.nvim',
- 'nvim-telescope/telescope-live-grep-args.nvim'},
- config = function()
- require('telescope/telescope')
- end
- }
+ 'nvim-telescope/telescope.nvim', tag = '0.1.5',
+ -- or , branch = '0.1.x',
+ dependencies = { 'nvim-lua/plenary.nvim',
+ 'nvim-telescope/telescope-live-grep-args.nvim'},
+ config = function()
+ require('telescope/telescope')
+ end
+ },
+
+ {'ThePrimeagen/harpoon',
+ dependencies = {'nvim-lua/plenary.nvim'},
+ config = function()
+ require('harpoon/harpoon')
+ end
+ }
})
-- nvim settings
diff --git a/lazy-lock.json b/lazy-lock.json
index aeaf136..09d589f 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -6,6 +6,7 @@
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"friendly-snippets": { "branch": "main", "commit": "5cc1f45c6aac699ad008fb85f6ae03236062667d" },
+ "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
"lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" },
"lsp-zero.nvim": { "branch": "v2.x", "commit": "9a686513eaaa13d737d0fec8956a18268ead8b29" },
"lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
diff --git a/lua/harpoon/harpoon.lua b/lua/harpoon/harpoon.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lua/harpoon/harpoon.lua
diff --git a/lua/nvim_settings/remap.lua b/lua/nvim_settings/remap.lua
index e18ccc2..6529fe5 100644
--- a/lua/nvim_settings/remap.lua
+++ b/lua/nvim_settings/remap.lua
@@ -16,4 +16,11 @@ vim.keymap.set({"n", "v"}, "<leader>y", [["+y]])
vim.keymap.set("n", "<leader>Y", [["+Y]])
vim.keymap.set("n", "<leader>pf", function() require("telescope.builtin").find_files() end)
-vim.keymap.set("n", "<leader>pg", function() require('telescope').extensions.live_grep_args.live_grep_args() end)
+vim.keymap.set("n", "<leader>pg", function() require("telescope").extensions.live_grep_args.live_grep_args() end)
+
+vim.keymap.set("n", "<leader>a", function() require("harpoon.mark").add_file() end)
+vim.keymap.set("n", "<leader>hv", function() require("harpoon.ui").toggle_quick_menu() end)
+vim.keymap.set("n", "<C-t>", function() require("harpoon.ui").nav_file(1) end)
+vim.keymap.set("n", "<C-h>", function() require("harpoon.ui").nav_file(2) end)
+vim.keymap.set("n", "<C-m>", function() require("harpoon.ui").nav_file(3) end)
+vim.keymap.set("n", "<C-l>", function() require("harpoon.ui").nav_file(4) end)