eglot for lsp-mode?

1 files changed, 22 insertions, 11 deletions

diff --git a/init.org b/init.org
index c32a33c..4d94c50 100644
--- a/init.org
+++ b/init.org
@@ -3183,21 +3183,29 @@
       #+end_src
 *** Language servers
     #+begin_src emacs-lisp
+      (use-package eglot
+        :ensure t)
+
       (use-package yasnippet
         :ensure t
         :diminish ((yas-minor-mode . "")))
 
-      (use-package lsp-mode
-        :commands (lsp lsp-deferred)
-        :custom (lsp-auto-guess-root t)
-        :ensure t
-        :diminish " †")
+      (use-package flymake :diminish)
 
-      (jao-define-attached-buffer "\\*lsp-help\\*" 33)
+      ;; (jao-define-attached-buffer "\\*eldoc\\( .*\\)?\\*" 0.33)
+
+      ;; (use-package lsp-mode
+      ;;   :commands (lsp lsp-deferred)
+      ;;   :custom (lsp-auto-guess-root t)
+      ;;   :ensure t
+      ;;   :diminish " †")
+
+      ;; (jao-define-attached-buffer "\\*lsp-help\\*" 33)
+
+      ;; (use-package company-lsp
+      ;;   :ensure t
+      ;;   :commands company-lsp)
 
-      (use-package company-lsp
-        :ensure t
-        :commands company-lsp)
      #+end_src
 *** JSON
     #+BEGIN_SRC emacs-lisp
@@ -3354,7 +3362,9 @@
               erlang-compile-function #'jao-erlang-compile)
 
         (add-hook 'erlang-mode-hook #'yas-minor-mode-on)
-        (add-hook 'erlang-mode-hook #'lsp))
+        (add-hook 'erlang-mode-hook #'eglot-ensure)
+        ;; (add-hook 'erlang-mode-hook #'lsp)
+        )
     #+end_src
 *** Elixir
 ***** packages
@@ -3365,7 +3375,8 @@
                    (expand-file-name "~/usr/share/elixir-ls/language_server.sh"))
           :bind (:map elixir-mode-map (("C-c C-z" . jao-vterm-repl-pop-to-repl)))
           :config
-          (add-hook 'elixir-mode-hook #'lsp)
+          ;; (add-hook 'elixir-mode-hook #'lsp)
+          (add-hook 'elixir-mode-hook #'eglot-ensure)
           (add-hook 'elixir-mode-hook #'yas-minor-mode))
 
         (use-package mix