From 72f10795389df239572381f89ad5326246387042 Mon Sep 17 00:00:00 2001 From: coolneng Date: Sun, 18 Dec 2022 01:04:16 +0100 Subject: [PATCH] Revert "Migrate to eglot" This reverts commit 193dce0fa57fd192f3ec71bb25974646ea19f2f2. --- +ui.el | 13 +++++++++---- config.el | 8 +++++++- init.el | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/+ui.el b/+ui.el index 2ed0dc7..9e89dab 100644 --- a/+ui.el +++ b/+ui.el @@ -17,10 +17,15 @@ (setq direnv-always-show-summary nil) ;; Change splash-screen banner (setq fancy-splash-image "~/.doom.d/assets/emacs.svg") -;; Remove distracting LSP UI elements -(after! eglot - (setq eldoc-echo-area-use-multiline-p nil) - (set-popup-rule! "^\\*eglot-help" :size 0.2 :quit t :select t)) +;; Disable LSP documentation popup +(after! lsp-ui + (setq lsp-ui-doc-enable nil + lsp-signature-auto-activate nil + lsp-enable-symbol-highlighting nil + lsp-ui-sideline-enable nil + lsp-modeline-code-actions-enable nil + lsp-headerline-breadcrumb-enable nil + lsp-len-enable nil)) ;; Shrink minibuffer (after! vertico (setq vertico-count 8)) diff --git a/config.el b/config.el index f0da477..14d40f9 100644 --- a/config.el +++ b/config.el @@ -64,7 +64,13 @@ ;; Associate polymode to R markdown files (add-to-list 'auto-mode-alist '("\\.[rR]md\\'" . poly-markdown+R-mode)) ;; Set clangd as C/C++ LSP -(set-eglot-client! 'cc-mode '("clangd" "-j=3" "--clang-tidy")) +(setq lsp-clients-clangd-args '("-j=3" + "--background-index" + "--clang-tidy" + "--completion-style=detailed" + "--header-insertion=never" + "--header-insertion-decorators=0")) +(after! lsp-clangd (set-lsp-priority! 'clangd 2)) ;; Use relative line numbers (Usage: number ) (setq display-line-numbers-type 'relative) ;; Use pass as auth-source diff --git a/init.el b/init.el index dfaafea..a5c4891 100644 --- a/init.el +++ b/init.el @@ -92,7 +92,7 @@ ;;gist ; interacting with github gists lookup ; navigate your code and its documentation ;;+docsets) ; ...or in Dash docsets locally - (lsp +eglot) ; M-x vscode + lsp ; M-x vscode ;;macos ; MacOS-specific commands magit ; a git porcelain for Emacs make ; run make tasks from Emacs