Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9af1dc44f9 | |||
| 4f16421686 |
@@ -1,7 +1,6 @@
|
|||||||
{
|
{
|
||||||
"blink.cmp": { "branch": "main", "commit": "1cc3b1a908fbcfd15451c4772759549724f38524" },
|
"blink.cmp": { "branch": "main", "commit": "1cc3b1a908fbcfd15451c4772759549724f38524" },
|
||||||
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
|
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
|
||||||
"harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" },
|
|
||||||
"kanagawa.nvim": { "branch": "master", "commit": "988082eb00b845e4afbcaa4fd8e903da8a3ab3b9" },
|
"kanagawa.nvim": { "branch": "master", "commit": "988082eb00b845e4afbcaa4fd8e903da8a3ab3b9" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
|
"lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
|
||||||
"lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" },
|
"lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" },
|
||||||
@@ -10,7 +9,7 @@
|
|||||||
"nvim-dap-ui": { "branch": "master", "commit": "727c032a8f63899baccb42a1c26f27687e62fc5e" },
|
"nvim-dap-ui": { "branch": "master", "commit": "727c032a8f63899baccb42a1c26f27687e62fc5e" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "339ccc81e08793c3af9b83882a6ebd90c9cc0d3b" },
|
"nvim-lspconfig": { "branch": "master", "commit": "339ccc81e08793c3af9b83882a6ebd90c9cc0d3b" },
|
||||||
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
|
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "5da195ac3dfafd08d8b10756d975f0e01e1d563a" },
|
"nvim-treesitter": { "branch": "master", "commit": "fd59f984416f696d85119fd4d15ce0965b179944" },
|
||||||
"oil.nvim": { "branch": "master", "commit": "09fa1d22f5edf0730824d2b222d726c8c81bbdc9" },
|
"oil.nvim": { "branch": "master", "commit": "09fa1d22f5edf0730824d2b222d726c8c81bbdc9" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
|
"plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
|
||||||
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }
|
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }
|
||||||
|
|||||||
@@ -1,43 +0,0 @@
|
|||||||
return {
|
|
||||||
{
|
|
||||||
"ThePrimeagen/harpoon",
|
|
||||||
branch = "harpoon2",
|
|
||||||
dependencies = { "nvim-lua/plenary.nvim" },
|
|
||||||
config = function()
|
|
||||||
local harpoon = require("harpoon")
|
|
||||||
|
|
||||||
-- REQUIRED
|
|
||||||
harpoon:setup()
|
|
||||||
-- REQUIRED
|
|
||||||
|
|
||||||
local conf = require("telescope.config").values
|
|
||||||
local function toggle_telescope(harpoon_files)
|
|
||||||
local file_paths = {}
|
|
||||||
for _, item in ipairs(harpoon_files.items) do
|
|
||||||
table.insert(file_paths, item.value)
|
|
||||||
end
|
|
||||||
|
|
||||||
require("telescope.pickers").new({}, {
|
|
||||||
prompt_title = "Harpoon",
|
|
||||||
finder = require("telescope.finders").new_table({
|
|
||||||
results = file_paths,
|
|
||||||
}),
|
|
||||||
previewer = conf.file_previewer({}),
|
|
||||||
sorter = conf.generic_sorter({}),
|
|
||||||
}):find()
|
|
||||||
end
|
|
||||||
vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end)
|
|
||||||
vim.keymap.set("n", "<C-e>", function() toggle_telescope(harpoon:list()) end,
|
|
||||||
{ desc = "Open harpoon window" })
|
|
||||||
|
|
||||||
vim.keymap.set("n", "<C-h>", function() harpoon:list():select(1) end)
|
|
||||||
vim.keymap.set("n", "<C-t>", function() harpoon:list():select(2) end)
|
|
||||||
vim.keymap.set("n", "<C-n>", function() harpoon:list():select(3) end)
|
|
||||||
vim.keymap.set("n", "<C-s>", function() harpoon:list():select(4) end)
|
|
||||||
|
|
||||||
-- Toggle previous & next buffers stored within Harpoon list
|
|
||||||
vim.keymap.set("n", "<C-P>", function() harpoon:list():prev() end)
|
|
||||||
vim.keymap.set("n", "<C-N>", function() harpoon:list():next() end)
|
|
||||||
end
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -20,7 +20,7 @@ return {
|
|||||||
local capabilities = require'blink.cmp'.get_lsp_capabilities()
|
local capabilities = require'blink.cmp'.get_lsp_capabilities()
|
||||||
|
|
||||||
lspconfig.lua_ls.setup {capabilities = capabilities}
|
lspconfig.lua_ls.setup {capabilities = capabilities}
|
||||||
lspconfig.ccls.setup {
|
lspconfig.clangd.setup {
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
init_options = {
|
init_options = {
|
||||||
compilationDatabaseDirectory = "build";
|
compilationDatabaseDirectory = "build";
|
||||||
@@ -32,8 +32,20 @@ return {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
--lspconfig.ccls.setup {
|
||||||
|
-- capabilities = capabilities,
|
||||||
|
-- init_options = {
|
||||||
|
-- compilationDatabaseDirectory = "build";
|
||||||
|
-- index = {
|
||||||
|
-- threads = 0;
|
||||||
|
-- };
|
||||||
|
-- clang = {
|
||||||
|
-- excludeArgs = { "-frounding-math"} ;
|
||||||
|
-- };
|
||||||
|
-- }
|
||||||
|
--}
|
||||||
lspconfig.cmake.setup {capabilities = capabilities}
|
lspconfig.cmake.setup {capabilities = capabilities}
|
||||||
lspconfig.dockerls.setup{capabilities = capabilities}
|
|
||||||
end,
|
end,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
return {
|
return {
|
||||||
"rebelot/kanagawa.nvim",
|
"rebelot/kanagawa.nvim",
|
||||||
config = function()
|
config = function()
|
||||||
vim.cmd('colorscheme kanagawa-wave')
|
vim.cmd('colorscheme kanagawa-dragon')
|
||||||
end,
|
end,
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user