From f64743bb44f7cbedf7e3e014dde047e7d73777ea Mon Sep 17 00:00:00 2001 From: Kenny Ballou Date: Wed, 3 Jan 2024 11:17:58 -0700 Subject: config: emacs: update eglot servers Use new JDK for JDTLS and use python-lsp-server from guix instead of jedi from nix. Signed-off-by: Kenny Ballou --- config/emacs/emacs.d/emacs.org | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/config/emacs/emacs.d/emacs.org b/config/emacs/emacs.d/emacs.org index 7f498046..071f81ff 100644 --- a/config/emacs/emacs.d/emacs.org +++ b/config/emacs/emacs.d/emacs.org @@ -3035,20 +3035,22 @@ Most shell applications accept Perl Compatible Regular Expressions." (eglot-report-progress t) (eglot-confirm-server-initiated-edits 'confirm) :config - (setq eglot-server-programs (list (cons 'java-mode (list "guix" - "shell" - "--pure" - "openjdk@18:jdk" - "--" - (expand-file-name (concat user-emacs-directory - "share/eclipse.jdt.ls/bin/jdtls")))) - (cons 'python-mode (list - "nix-shell" - "--packages" - "python310Packages.jedi-language-server" - "--run" - "jedi-language-server"))))) (setq eglot-stay-out-of '(flymake)) + (setq eglot-server-programs (list (cons '(java-mode java-ts-mode) + (list "guix" + "shell" + "--pure" + "openjdk@21:jdk" + "--" + (expand-file-name (concat user-emacs-directory + "share/eclipse.jdt.ls/bin/jdtls")))) + (cons '(python-mode python-ts-mode) (list + "guix" + "shell" + "--pure" + "python-lsp-server" + "--" + "pylsp"))))) #+end_src **** Debug Adapter Protocol -- cgit v1.2.1