From 317fc8b79cc51e10f20f55d0df8a10aa87e387c1 Mon Sep 17 00:00:00 2001 From: Anthony Debucquoy Date: Fri, 6 Feb 2026 12:45:07 +0100 Subject: [PATCH] nvim upgrade --- .gitmodules | 27 ++++++++++++ nvim/.config/nvim/after/ftplugin/python.lua | 5 --- nvim/.config/nvim/after/ftplugin/zig.lua | 9 ---- nvim/.config/nvim/init.lua | 43 +++++++++++++++++-- .../pack/autoload/start/LanguageTool.nvim | 1 + .../.config/nvim/pack/autoload/start/nvim-dap | 1 + .../nvim/pack/autoload/start/nvim-dap-ui | 1 + .../nvim/pack/autoload/start/nvim-jdtls | 1 + .../nvim/pack/autoload/start/nvim-lspconfig | 1 + .../.config/nvim/pack/autoload/start/nvim-nio | 1 + .../nvim/pack/autoload/start/ranger.vim | 1 + .../nvim/pack/autoload/start/reply.vim | 1 + .../nvim/pack/autoload/start/vim-dispatch | 1 + nvim/.config/nvim/plugin/lsp.vim | 8 ++++ 14 files changed, 84 insertions(+), 17 deletions(-) create mode 160000 nvim/.config/nvim/pack/autoload/start/LanguageTool.nvim create mode 160000 nvim/.config/nvim/pack/autoload/start/nvim-dap create mode 160000 nvim/.config/nvim/pack/autoload/start/nvim-dap-ui create mode 160000 nvim/.config/nvim/pack/autoload/start/nvim-jdtls create mode 160000 nvim/.config/nvim/pack/autoload/start/nvim-lspconfig create mode 160000 nvim/.config/nvim/pack/autoload/start/nvim-nio create mode 160000 nvim/.config/nvim/pack/autoload/start/ranger.vim create mode 160000 nvim/.config/nvim/pack/autoload/start/reply.vim create mode 160000 nvim/.config/nvim/pack/autoload/start/vim-dispatch diff --git a/.gitmodules b/.gitmodules index 55dcad8..00620a1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -103,3 +103,30 @@ [submodule "vim/.vim/pack/autoload/start/vim-textidote"] path = vim/.vim/pack/autoload/start/vim-textidote url = https://github.com/PatrBal/vim-textidote +[submodule "nvim/.config/nvim/pack/autoload/start/nvim-dap"] + path = nvim/.config/nvim/pack/autoload/start/nvim-dap + url = git@github.com:mfussenegger/nvim-dap +[submodule "nvim/.config/nvim/pack/autoload/start/LanguageTool.nvim"] + path = nvim/.config/nvim/pack/autoload/start/LanguageTool.nvim + url = git@github.com:vigoux/LanguageTool.nvim +[submodule "nvim/.config/nvim/pack/autoload/start/nvim-dap-ui"] + path = nvim/.config/nvim/pack/autoload/start/nvim-dap-ui + url = git@github.com:rcarriga/nvim-dap-ui +[submodule "nvim/.config/nvim/pack/autoload/start/nvim-jdtls"] + path = nvim/.config/nvim/pack/autoload/start/nvim-jdtls + url = git@github.com:mfussenegger/nvim-jdtls +[submodule "nvim/.config/nvim/pack/autoload/start/nvim-lspconfig"] + path = nvim/.config/nvim/pack/autoload/start/nvim-lspconfig + url = git@github.com:neovim/nvim-lspconfig +[submodule "nvim/.config/nvim/pack/autoload/start/nvim-nio"] + path = nvim/.config/nvim/pack/autoload/start/nvim-nio + url = git@github.com:nvim-neotest/nvim-nio +[submodule "nvim/.config/nvim/pack/autoload/start/ranger.vim"] + path = nvim/.config/nvim/pack/autoload/start/ranger.vim + url = git@github.com:francoiscabrol/ranger.vim +[submodule "nvim/.config/nvim/pack/autoload/start/reply.vim"] + path = nvim/.config/nvim/pack/autoload/start/reply.vim + url = git@github.com:rhysd/reply.vim +[submodule "nvim/.config/nvim/pack/autoload/start/vim-dispatch"] + path = nvim/.config/nvim/pack/autoload/start/vim-dispatch + url = git@github.com:tpope/vim-dispatch diff --git a/nvim/.config/nvim/after/ftplugin/python.lua b/nvim/.config/nvim/after/ftplugin/python.lua index 39c4ae3..b4e139e 100644 --- a/nvim/.config/nvim/after/ftplugin/python.lua +++ b/nvim/.config/nvim/after/ftplugin/python.lua @@ -1,8 +1,3 @@ -vim.lsp.start({ - name = 'jedi', - cmd = {'jedi-language-server'}, -}) - vim.keymap.set('n', '', ":Repl") vim.keymap.set('v', '', ":'<,'>Repl") diff --git a/nvim/.config/nvim/after/ftplugin/zig.lua b/nvim/.config/nvim/after/ftplugin/zig.lua index deb3736..60e1e1d 100644 --- a/nvim/.config/nvim/after/ftplugin/zig.lua +++ b/nvim/.config/nvim/after/ftplugin/zig.lua @@ -1,10 +1 @@ -vim.lsp.start({ - name = 'zls', - cmd = {'zls'}, - on_attach = function(client, bufnr) - vim.lsp.completion.enable(true, client.id, bufnr, { - autotrigger = true, - }) - end, -}) vim.g.zig_fmt_autosave = 0 diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index d5b7dd8..48700a7 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -5,9 +5,46 @@ vim.cmd('source ~/.vimrc"') -- Enable LSPs -vim.lsp.enable("clangd") -vim.lsp.enable("cmake") -vim.lsp.enable("lua_ls") vim.lsp.enable('bashls') +vim.lsp.enable('clangd') +vim.lsp.enable('cmake') +vim.lsp.enable('jdtls') vim.lsp.enable('jedi_language_server') +vim.lsp.enable('lua_ls') vim.lsp.enable('texlab') +vim.lsp.enable('zls') + +-- LSPs config +vim.lsp.config("lua_ls", { + settings = { + Lua = { + diagnostics = { + globals = { "vim" } + }, + workspace = { + checkThirdParty = "Apply", + telemetry = { enable = false }, + library = { + -- vim.env.VIMRUNTIME, + "${3rd}/love2d/library" + } + } + }, + } +}) + +vim.lsp.config("zls", { + on_attach = function(client, bufnr) + vim.lsp.completion.enable(true, client.id, bufnr, { + autotrigger = true, + }) + end +}) + +-- vim.lsp.config("jdtls", { +-- settings = { +-- java = { +-- +-- } +-- } +-- }) diff --git a/nvim/.config/nvim/pack/autoload/start/LanguageTool.nvim b/nvim/.config/nvim/pack/autoload/start/LanguageTool.nvim new file mode 160000 index 0000000..809e7d7 --- /dev/null +++ b/nvim/.config/nvim/pack/autoload/start/LanguageTool.nvim @@ -0,0 +1 @@ +Subproject commit 809e7d77fec834597f495fec737c59292a10025b diff --git a/nvim/.config/nvim/pack/autoload/start/nvim-dap b/nvim/.config/nvim/pack/autoload/start/nvim-dap new file mode 160000 index 0000000..968f89f --- /dev/null +++ b/nvim/.config/nvim/pack/autoload/start/nvim-dap @@ -0,0 +1 @@ +Subproject commit 968f89f8aac11b6bdbfc942c71d3436658c1435f diff --git a/nvim/.config/nvim/pack/autoload/start/nvim-dap-ui b/nvim/.config/nvim/pack/autoload/start/nvim-dap-ui new file mode 160000 index 0000000..cf91d5e --- /dev/null +++ b/nvim/.config/nvim/pack/autoload/start/nvim-dap-ui @@ -0,0 +1 @@ +Subproject commit cf91d5e2d07c72903d052f5207511bf7ecdb7122 diff --git a/nvim/.config/nvim/pack/autoload/start/nvim-jdtls b/nvim/.config/nvim/pack/autoload/start/nvim-jdtls new file mode 160000 index 0000000..291dad7 --- /dev/null +++ b/nvim/.config/nvim/pack/autoload/start/nvim-jdtls @@ -0,0 +1 @@ +Subproject commit 291dad797b5427ca0c9b7e0dd261279c7c3823e1 diff --git a/nvim/.config/nvim/pack/autoload/start/nvim-lspconfig b/nvim/.config/nvim/pack/autoload/start/nvim-lspconfig new file mode 160000 index 0000000..ac98db2 --- /dev/null +++ b/nvim/.config/nvim/pack/autoload/start/nvim-lspconfig @@ -0,0 +1 @@ +Subproject commit ac98db2f9f06a56498ec890a96928774eae412c3 diff --git a/nvim/.config/nvim/pack/autoload/start/nvim-nio b/nvim/.config/nvim/pack/autoload/start/nvim-nio new file mode 160000 index 0000000..21f5324 --- /dev/null +++ b/nvim/.config/nvim/pack/autoload/start/nvim-nio @@ -0,0 +1 @@ +Subproject commit 21f5324bfac14e22ba26553caf69ec76ae8a7662 diff --git a/nvim/.config/nvim/pack/autoload/start/ranger.vim b/nvim/.config/nvim/pack/autoload/start/ranger.vim new file mode 160000 index 0000000..91e82de --- /dev/null +++ b/nvim/.config/nvim/pack/autoload/start/ranger.vim @@ -0,0 +1 @@ +Subproject commit 91e82debdf566dfaf47df3aef0a5fd823cedf41c diff --git a/nvim/.config/nvim/pack/autoload/start/reply.vim b/nvim/.config/nvim/pack/autoload/start/reply.vim new file mode 160000 index 0000000..f458f7c --- /dev/null +++ b/nvim/.config/nvim/pack/autoload/start/reply.vim @@ -0,0 +1 @@ +Subproject commit f458f7c13cbd8eafaf9acd69e8eade71416338c5 diff --git a/nvim/.config/nvim/pack/autoload/start/vim-dispatch b/nvim/.config/nvim/pack/autoload/start/vim-dispatch new file mode 160000 index 0000000..a2ff28a --- /dev/null +++ b/nvim/.config/nvim/pack/autoload/start/vim-dispatch @@ -0,0 +1 @@ +Subproject commit a2ff28abdb2d89725192db5b8562977d392a4d3f diff --git a/nvim/.config/nvim/plugin/lsp.vim b/nvim/.config/nvim/plugin/lsp.vim index ea2ff89..7d6552b 100644 --- a/nvim/.config/nvim/plugin/lsp.vim +++ b/nvim/.config/nvim/plugin/lsp.vim @@ -5,3 +5,11 @@ function! OpenCompletion() endfunction autocmd InsertCharPre * if &omnifunc != "" | call OpenCompletion() | endif + +" https://github.com/mfussenegger/nvim-jdtls?tab=readme-ov-file +nnoremap lua require'jdtls'.organize_imports() +nnoremap crv lua require('jdtls').extract_variable() +vnoremap crv lua require('jdtls').extract_variable(true) +nnoremap crc lua require('jdtls').extract_constant() +vnoremap crc lua require('jdtls').extract_constant(true) +vnoremap crm lua require('jdtls').extract_method(true)