From e4cb69ad8241a4c7538a73a5bbfdf9ac88807c0b Mon Sep 17 00:00:00 2001 From: Jonas Hahn Date: Thu, 18 Sep 2025 23:18:19 +0200 Subject: [PATCH] Fix double lsp --- lazy-lock.json | 24 +++++++++++------------- lua/config/keymaps.lua | 2 +- lua/plugins/lsp.lua | 16 ++++++++++++---- lua/plugins/treesitter.lua | 6 +++++- lua/utils/functions.lua | 5 +++++ 5 files changed, 34 insertions(+), 19 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index d94479b..3ab72bd 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,31 +3,29 @@ "aerial.nvim": { "branch": "master", "commit": "c7cbbad40c2065fccfd1f1863bb2c08180c0533d" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, - "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, + "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "fzf-lua": { "branch": "main", "commit": "96dede0bca5cc24868df7c8b46b5a32b89c2f19d" }, + "fzf-lua": { "branch": "main", "commit": "8adf950093af5361621cf52208d64995b1af78b5" }, "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, - "gruvbox.nvim": { "branch": "main", "commit": "12c2624287dc827edb5d72b2bc4c9619e692a554" }, + "gruvbox.nvim": { "branch": "main", "commit": "00e38a379bab3389e187b3953566d67d494dfddd" }, "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, - "lazygit.nvim": { "branch": "main", "commit": "3c524ebec6072568064235c407195e9f9fd0cb8a" }, + "lazygit.nvim": { "branch": "main", "commit": "b9eae3badab982e71abab96d3ee1d258f0c07961" }, "lspsaga.nvim": { "branch": "main", "commit": "8efe00d6aed9db6449969f889170f1a7e43101a1" }, - "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, + "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "5e085efe67fccb13372d54331d849219662a7e93" }, "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, "nvim-lspconfig": { "branch": "master", "commit": "f8474abbe3f0cf7cf2476331313b583207787148" }, - "nvim-tree.lua": { "branch": "master", "commit": "fefa335f1c8f690eb668a1efd18ee4fc6d64cd3e" }, - "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" }, - "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "statuscol.nvim": { "branch": "main", "commit": "c46172d0911aa5d49ba5f39f4351d1bb7aa289cc" }, - "telekasten.nvim": { "branch": "main", "commit": "b3ac2b07f2df504bb80112fec349714086a80037" }, + "nvim-tree.lua": { "branch": "master", "commit": "25d16aab7d29ca940a9feb92e6bb734697417009" }, + "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" }, + "nvim-web-devicons": { "branch": "master", "commit": "50b5b06bff13a9b4eab946de7c7033649a6618a1" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "telescope-undo.nvim": { "branch": "main", "commit": "928d0c2dc9606e01e2cc547196f48d2eaecf58e5" }, - "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, + "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" }, "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua index b01260a..4942b9d 100644 --- a/lua/config/keymaps.lua +++ b/lua/config/keymaps.lua @@ -54,7 +54,7 @@ vim.keymap.set('n', 'ock', ':e ~/.config/nvim/lua/config/keymaps.lua vim.keymap.set('n', 'ocd', ':e ~/.config/nvim/lua/config/autocmds.lua`.zz') vim.keymap.set('n', 'oco', ':e ~/.config/nvim/lua/config/options.lua`.zz') vim.keymap.set('n', 'ocl', ':e ~/.config/nvim/lua/config/lazy.lua`.zz') -vim.keymap.set('n', 'oczl', ':e ~/.config/nvim/lua/config/lsp.lua`.zz') +vim.keymap.set('n', 'oczl', ':e ~/.config/nvim/lua/plugins/lsp.lua`.zz') vim.keymap.set('n', 'ocp', ':e ~/.config/nvim/lua/plugins/misc.lua`.zz') vim.keymap.set('n', 'ocf', ':e ~/.config/nvim/lua/utils/functions.lua`.zz') vim.keymap.set('n', 'oca', ':e ~/.config/nvim/lua/utils/after.lua`.zz') diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 8a198c4..be11fc3 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -78,7 +78,7 @@ return { require("mason-lspconfig").setup({ ensure_installed = servers_modified, - automatic_installation = true, + automatic_enable = false, }) end, @@ -134,7 +134,15 @@ return { { name = "buffer" }, { name = "path" }, }), - performance = { max_view_entries = max_entries }, + performance = { + debounce = 60, + throttle = 30, + fetching_timeout = 500, + filtering_context_budget = 3, + confirm_resolve_timeout = 80, + async_budget = 1, + max_view_entries = max_entries, + } }) end }, @@ -167,10 +175,10 @@ return { vim.keymap.set("n", "ca", vim.lsp.buf.code_action, opts) vim.keymap.set("n", "]d", function() - vim.diagnostic.jump({count=1, float=true}) + vim.diagnostic.jump({ count = 1, float = true }) end, opts) vim.keymap.set("n", "[d", function() - vim.diagnostic.jump({count=-1, float=true}) + vim.diagnostic.jump({ count = -1, float = true }) end, opts) vim.keymap.set("n", "lwa", vim.lsp.buf.add_workspace_folder, opts) diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 28d2928..b47019e 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -7,10 +7,14 @@ return { local configs = require("nvim-treesitter.configs") configs.setup({ sync_install = true, - ensure_installed = { "typst", "go", "bash", "python", "nix", "lua" }, + ensure_installed = { "css", "html", "rust", "php", "typst", "go", "bash", "python", "nix", "lua", "cpp", "c", "java" }, + auto_install = true, highlight = { enable = true }, indent = { enable = true }, fold = { enable = true }, + + ignore_install = {}, + modules = {}, }) end }, diff --git a/lua/utils/functions.lua b/lua/utils/functions.lua index a3e7280..af76a2a 100644 --- a/lua/utils/functions.lua +++ b/lua/utils/functions.lua @@ -67,6 +67,10 @@ function M.get_lsp_servers() if vim.fn.executable("clangd") == 1 then table.insert(servers, "clangd") end + + if vim.fn.executable("java") == 1 then + table.insert(servers, "jdtls") + end table.insert(servers, "pyright") table.insert(servers, "bashls") table.insert(servers, "cssls") @@ -96,6 +100,7 @@ function M.get_lsp_servers() if vim.fn.executable("zls") == 1 then table.insert(servers, "zls") end + end populate_servers()