diff --git a/vim/.vimrc b/vim/.vimrc index 0327d02d..0d4cd974 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -88,7 +88,7 @@ let g:LanguageClient_rootMarkers = { \ } let g:LanguageClient_serverCommands = { \ 'go': ['gopls'], -\ 'python': ['pyls', '--log-file=/tmp/python-languageserver.log', '--verbose'], +\ 'python': ['pylsp', '--log-file=/tmp/python-languageserver.log', '--verbose'], \ 'rust': ['rustup', 'run', 'stable', 'rls'], \ 'svelte': ['svelteserver', '--stdio'], \ 'terraform': ['terraform-ls', 'serve'], diff --git a/vim/aconfmgr.sh b/vim/aconfmgr.sh index ffbe4061..5b05642c 100644 --- a/vim/aconfmgr.sh +++ b/vim/aconfmgr.sh @@ -11,9 +11,10 @@ AddPackage python-pynvim # Language servers AddPackage gopls AddPackage --foreign nodejs-vls -AddPackage python-language-server -AddPackage --foreign python-language-server-black -AddPackage --foreign pyls-mypy +AddPackage python-lsp-server +AddPackage --foreign python-lsp-black +AddPackage --foreign python-mypy-ls +AddPackage --foreign python-pyls-isort rustup component add rls AddPackage --foreign nodejs-svelte-language-server AddPackage --foreign terraform-ls diff --git a/vim/lsp.json b/vim/lsp.json index 68308e02..8504d860 100644 --- a/vim/lsp.json +++ b/vim/lsp.json @@ -1,8 +1,7 @@ { - "pyls.plugins.autopep8.enabled": false, - "pyls.plugins.black.enabled": true, - "pyls.plugins.pyls_mypy.enabled": true, - "pyls.plugins.pyls_mypy.live_mode": true, - "pyls.plugins.yapf.enabled": false, + "pylsp.plugins.pylsp_black.enabled": true, + "pylsp.plugins.pylsp_mypy.enabled": true, + "pylsp.plugins.pylsp_mypy.live_mode": true, + "pylsp.plugins.yapf.enabled": false, "rust.clippy_preference": "on" }