From 3e1c7b565b536994a436f20cbac811833a6e4ec4 Mon Sep 17 00:00:00 2001 From: John Doty Date: Thu, 27 May 2021 07:57:51 -0700 Subject: [PATCH] LSP stuff --- .emacs.d/init.el | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 194ec6f..5d06191 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -306,15 +306,24 @@ :hook (typescript-mode . company-mode)) ;; ================================================================= -;; LSP-mode. Common configuration for LSP-based systems. +;; Common configuration for LSP-based systems. ;; ================================================================= -(use-package lsp-mode :ensure t - :commands lsp-mode +;; (use-package lsp-mode :ensure +;; :init (setq lsp-pyls-server-command "pyls-language-server") +;; :commands (lsp lsp-mode lsp-deferred) +;; :hook (python-mode . lsp-deferred) +;; :config +;; (use-package company-lsp +;; :config (add-to-list 'company-backends 'company-lsp)) +;; (use-package lsp-ui +;; :config (add-hook 'lsp-mode-hook 'lsp-ui-mode))) +(use-package eglot :ensure + :commands eglot-ensure + :hook (python-mode . eglot-ensure) :config - (use-package company-lsp - :config (add-to-list 'company-backends 'company-lsp)) - (use-package lsp-ui - :config (add-hook 'lsp-mode-hook 'lsp-ui-mode))) + (add-to-list 'eglot-server-programs '(python-mode . ("pyls-language-server"))) + ) + ;; ================================================================= @@ -648,6 +657,7 @@ (add-hook 'python-mode-hook 'my-python-mode-hook) + ;; ================================================================= ;; JavaScript Support ;; =================================================================