Skip to content

Commit bc2e3da

Browse files
committed
fix leader key not set issue, mapping *.zig.zon to zig
1 parent 73eae4e commit bc2e3da

File tree

6 files changed

+53
-2
lines changed

6 files changed

+53
-2
lines changed

init.lua

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
require("cgqaq.plugins")
2-
require("cgqaq.configs")
2+
require("cgqaq.keymaps")
33

44
require("cgqaq.conf")
5-
require("cgqaq.keymaps")
5+
require("cgqaq.configs")
6+
require("cgqaq.filetype")

lazy-lock.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"copilot.vim": { "branch": "release", "commit": "79e1a892ca9b4fa6234fd25f2930dba5201700bd" },
1010
"dracula.nvim": { "branch": "main", "commit": "a6cb758d4b182d9f2b7e742910078d94877c1059" },
1111
"gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
12+
"harpoon": { "branch": "harpoon2", "commit": "a38be6e0dd4c6db66997deab71fc4453ace97f9c" },
1213
"lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
1314
"lsp-inlayhints.nvim": { "branch": "main", "commit": "d981f65c9ae0b6062176f0accb9c151daeda6f16" },
1415
"lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },

lua/cgqaq/configs/harpoon.lua

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
local harpoon = require('harpoon')
2+
harpoon:setup()
3+
4+
print(vim.g.mapleader)
5+
vim.keymap.set("n", "<leader>a", function() harpoon:list():append() end)
6+
vim.keymap.set("n", "<C-e>", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
7+
8+
vim.keymap.set("n", "<F5>", function() harpoon:list():select(1) end)
9+
vim.keymap.set("n", "<F6>", function() harpoon:list():select(2) end)
10+
vim.keymap.set("n", "<F7>", function() harpoon:list():select(3) end)
11+
vim.keymap.set("n", "<F8>", function() harpoon:list():select(4) end)
12+
13+
-- Toggle previous & next buffers stored within Harpoon list
14+
vim.keymap.set("n", "<C-k>", function() harpoon:list():prev() end)
15+
vim.keymap.set("n", "<C-j>", function() harpoon:list():next() end)
16+
17+
-- basic telescope configuration
18+
local conf = require("telescope.config").values
19+
local function toggle_telescope(harpoon_files)
20+
local file_paths = {}
21+
for _, item in ipairs(harpoon_files.items) do
22+
table.insert(file_paths, item.value)
23+
end
24+
25+
require("telescope.pickers").new({}, {
26+
prompt_title = "Harpoon",
27+
finder = require("telescope.finders").new_table({
28+
results = file_paths,
29+
}),
30+
previewer = conf.file_previewer({}),
31+
sorter = conf.generic_sorter({}),
32+
}):find()
33+
end
34+
35+
-- vim.keymap.set("n", "<C-e>", function() toggle_telescope(harpoon:list()) end,
36+
-- { desc = "Open harpoon window" })

lua/cgqaq/configs/init.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ require("cgqaq.configs.cmp")
77
require("cgqaq.configs.inlay")
88
require("cgqaq.configs.toggleterm")
99
require("cgqaq.configs.bufferline")
10+
require("cgqaq.configs.harpoon")

lua/cgqaq/filetype.lua

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
vim.api.nvim_create_autocmd({"BufRead", "BufNewFile"}, {
2+
pattern = "*.zig.zon",
3+
callback = function()
4+
vim.bo.filetype = 'zig'
5+
end,
6+
})

lua/cgqaq/plugins.lua

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,13 @@ ensure_lazy()
1717
return require("lazy").setup({
1818
{"nvim-treesitter/nvim-treesitter", build = ":TSUpdate"},
1919

20+
-- files and navigation
2021
{"nvim-telescope/telescope.nvim", version="0.1.5", dependencies = {"nvim-lua/plenary.nvim"}},
22+
{
23+
"ThePrimeagen/harpoon",
24+
branch = "harpoon2",
25+
dependencies = { "nvim-lua/plenary.nvim" }
26+
},
2127

2228
{"nvim-lualine/lualine.nvim", dependencies = {"nvim-tree/nvim-web-devicons", optional = true}},
2329

0 commit comments

Comments
 (0)