From e68e13829fcef14ed86883aae53939743afbd4f0 Mon Sep 17 00:00:00 2001 From: Lucas Sta Maria Date: Thu, 18 Jan 2024 17:12:23 -0500 Subject: [PATCH] fix(emacs): migrate to eglot for java Signed-off-by: Lucas Sta Maria --- .emacs.d/include/misc.el | 14 ++++++++++---- .emacs.d/init.el | 5 +++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.emacs.d/include/misc.el b/.emacs.d/include/misc.el index 5181d86..75ae595 100644 --- a/.emacs.d/include/misc.el +++ b/.emacs.d/include/misc.el @@ -5,9 +5,12 @@ ;; short), then it belongs here. ;;; Code: +(require 'lsp-mode) +(require 'lsp-java) (require 'git-gutter) (require 'elfeed) (require 'neotree) +(require 'copilot) (defun config-compile () "(Re)compile the current Emacs configuration." @@ -59,13 +62,16 @@ (setq lsp-ui-doc-header t) (setq lsp-ui-doc-border (face-foreground 'default)) (setq lsp-ui-sideline-show-code-actions t) +(setq lsp-enable-file-watchers nil) +(setq lsp-log-max nil) +(setq lsp-enable-links nil) +(setq lsp-use-plists t) + (custom-set-faces '(lsp-ui-doc-header ((t (:inherit nano-strong :background-color nano-dark-background))))) -(setq lsp-java-configuration-runtimes - '[(:name "JavaSE-21" - :path "/usr/lib/jvm/java-21-openjdk" - :default t)]) +(setq read-process-output-max (* 4 1024 1024)) + ;; Git Gutter (global-git-gutter-mode +1) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index bb9477b..7892371 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -68,6 +68,7 @@ ;; LSP (straight-use-package 'lsp-mode) (straight-use-package 'lsp-ui) +(straight-use-package 'eglot) ;; Misc (straight-use-package 'dash) @@ -96,7 +97,7 @@ (straight-use-package 'slime) (straight-use-package 'haskell-mode) (straight-use-package 'lsp-haskell) -(straight-use-package 'lsp-java) +(straight-use-package 'eglot-java) (straight-use-package 'company-coq) (straight-use-package 'proof-general) (straight-use-package '(llvm-mode :type git :host github @@ -147,7 +148,7 @@ (add-hook 'go-mode-hook #'lsp) (add-hook 'tuareg-mode-hook #'lsp) (add-hook 'haskell-mode-hook #'lsp) -(add-hook 'java-mode-hook #'lsp) +(add-hook 'java-mode-hook #'eglot-java-mode) (add-hook 'emacs-lisp-mode-hook #'paredit-mode) (add-hook 'scheme-mode-hook #'paredit-mode)