Skip to content

Commit f7a24b7

Browse files
committed
fixed harpoon config
1 parent 5bc4c43 commit f7a24b7

File tree

3 files changed

+74
-24
lines changed

3 files changed

+74
-24
lines changed

init.lua

Lines changed: 58 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,11 +1013,64 @@ require('lazy').setup({
10131013
})
10141014

10151015
-- Harpoon keybindings
1016-
vim.keymap.set('n', '<leader>ma', require('harpoon.mark').add_file, { desc = '[M]ark [A]dd file' })
1017-
vim.keymap.set('n', '<leader>mm', require('harpoon.ui').toggle_quick_menu, { desc = '[M]ark [M]enu' })
1018-
vim.keymap.set('n', '<leader>mn', require('harpoon.ui').nav_next, { desc = '[M]ark [N]ext' })
1019-
vim.keymap.set('n', '<leader>mp', require('harpoon.ui').nav_prev, { desc = '[M]ark [P]revious' })
1020-
vim.keymap.set('n', '<leader>md', require('harpoon.mark').rm_file, { desc = '[M]ark [D]elete file' })
1016+
local harpoon = require 'harpoon'
1017+
1018+
-- REQUIRED
1019+
harpoon:setup()
1020+
-- REQUIRED
1021+
1022+
vim.keymap.set('n', '<leader>ma', function()
1023+
harpoon:list():add()
1024+
end, { desc = '[M]ark [A]dd file' })
1025+
1026+
vim.keymap.set('n', '<C-e>', function()
1027+
harpoon.ui:toggle_quick_menu(harpoon:list())
1028+
end, { desc = '[M]ark [M]enu' })
1029+
1030+
vim.keymap.set('n', '<leader>mn', function()
1031+
harpoon:list():next()
1032+
end, { desc = '[M]ark [N]ext' })
1033+
1034+
vim.keymap.set('n', '<leader>mp', function()
1035+
harpoon:list():prev()
1036+
end, { desc = '[M]ark [P]revious' })
1037+
1038+
vim.keymap.set('n', '<C-h>', function()
1039+
harpoon:list():select(1)
1040+
end)
1041+
vim.keymap.set('n', '<C-t>', function()
1042+
harpoon:list():select(2)
1043+
end)
1044+
vim.keymap.set('n', '<C-n>', function()
1045+
harpoon:list():select(3)
1046+
end)
1047+
vim.keymap.set('n', '<C-s>', function()
1048+
harpoon:list():select(4)
1049+
end)
1050+
1051+
-- basic telescope configuration
1052+
local conf = require('telescope.config').values
1053+
local function toggle_telescope(harpoon_files)
1054+
local file_paths = {}
1055+
for _, item in ipairs(harpoon_files.items) do
1056+
table.insert(file_paths, item.value)
1057+
end
1058+
1059+
require('telescope.pickers')
1060+
.new({}, {
1061+
prompt_title = 'Harpoon',
1062+
finder = require('telescope.finders').new_table {
1063+
results = file_paths,
1064+
},
1065+
previewer = conf.file_previewer {},
1066+
sorter = conf.generic_sorter {},
1067+
})
1068+
:find()
1069+
end
1070+
1071+
vim.keymap.set('n', '<leader>mt', function()
1072+
toggle_telescope(harpoon:list())
1073+
end, { desc = 'Open harpoon window' })
10211074

10221075
-- The line beneath this is called `modeline`. See `:help modeline`
10231076
-- vim: ts=2 sts=2 sw=2 et

lazy-lock.json

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
11
{
2-
"LuaSnip": { "branch": "master", "commit": "0f7bbce41ea152a94d12aea286f2ce98e63c0f58" },
3-
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
2+
"LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" },
3+
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
44
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
55
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
6-
"conform.nvim": { "branch": "master", "commit": "a203480a350b03092e473bf3001733d547160a73" },
6+
"conform.nvim": { "branch": "master", "commit": "f4e8837878fc5712d053ba3091a73d27d96a09e2" },
77
"fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" },
88
"gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
9-
"lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" },
9+
"harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" },
10+
"lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
1011
"lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" },
1112
"luvit-meta": { "branch": "main", "commit": "57d464c4acb5c2e66bd4145060f5dc9e96a7bbb7" },
12-
"mason-lspconfig.nvim": { "branch": "main", "commit": "43894adcf10bb1190c2184bd7c1750e8ea2b3dce" },
13+
"mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" },
1314
"mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
1415
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
15-
"mini.nvim": { "branch": "main", "commit": "c8922aef8207137e66c80acdb9523668599ba62a" },
16-
"neovim": { "branch": "main", "commit": "07a887a7bef4aacea8c7caebaf8cbf808cdc7a8e" },
17-
"nvim-cmp": { "branch": "main", "commit": "ed31156aa2cc14e3bc066c59357cc91536a2bc01" },
18-
"nvim-lspconfig": { "branch": "master", "commit": "e8f9c46c99e1901167a92ab13e2357158e5aabdb" },
19-
"nvim-treesitter": { "branch": "master", "commit": "8d4fdc5e47e2a4e00179e43f56221250ce365973" },
20-
"nvim-web-devicons": { "branch": "master", "commit": "edbe0a65cfacbbfff6a4a1e98ddd60c28c560509" },
21-
"oil.nvim": { "branch": "master", "commit": "3c2de37accead0240fbe812f5ccdedfe0b973557" },
16+
"mini.nvim": { "branch": "main", "commit": "7ebfab26d77a4b9b05aaae565907e7fa4b2ee154" },
17+
"neovim": { "branch": "main", "commit": "91548dca53b36dbb9d36c10f114385f759731be1" },
18+
"nvim-cmp": { "branch": "main", "commit": "3403e2e9391ed0a28c3afddd8612701b647c8e26" },
19+
"nvim-lspconfig": { "branch": "master", "commit": "3cb6c05779459eb5fe9cddbb47675593594f0415" },
20+
"nvim-treesitter": { "branch": "master", "commit": "cfbbdd5effbde3d47d2d662e67cfcd62a93b783f" },
21+
"nvim-web-devicons": { "branch": "master", "commit": "8a8e0668b8ad6124813a44a626afdf850dd24874" },
22+
"oil.nvim": { "branch": "master", "commit": "dba037598843973b8c54bc5ce0318db4a0da439d" },
2223
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
23-
"telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
24+
"telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
2425
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
2526
"telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
2627
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
2728
"undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
2829
"vim-fugitive": { "branch": "master", "commit": "320b18fba2a4f2fe3c8225c778c687e0d2620384" },
2930
"vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
30-
"which-key.nvim": { "branch": "main", "commit": "b9684c6ec54d8a8452bdcf0d613c7ad0223fc3fe" }
31+
"which-key.nvim": { "branch": "main", "commit": "4ab3bbe976e63b5390d3fca74a52a092a041cd30" }
3132
}

lua/custom/plugins/init.lua

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@ return {
1919
'ThePrimeagen/harpoon',
2020
branch = 'harpoon2',
2121
config = function()
22-
require('harpoon').setup({
23-
menu = {
24-
width = vim.api.nvim_win_get_width(0) - 4,
25-
}
26-
})
22+
require('harpoon').setup()
2723
end,
2824
},
2925
}

0 commit comments

Comments
 (0)