diff --git a/+ui.el b/+ui.el
index ada8790..19128d6 100644
--- a/+ui.el
+++ b/+ui.el
@@ -18,15 +18,10 @@
 (setq direnv-always-show-summary nil)
 ;; Change splash-screen banner
 (setq fancy-splash-image "~/.doom.d/assets/emacs.svg")
-;; 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))
+;; 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))
 ;; Shrink minibuffer
 (after! vertico
   (setq vertico-count 8))
diff --git a/config.el b/config.el
index 14d40f9..f0da477 100644
--- a/config.el
+++ b/config.el
@@ -64,13 +64,7 @@
 ;; Associate polymode to R markdown files
 (add-to-list 'auto-mode-alist '("\\.[rR]md\\'" . poly-markdown+R-mode))
 ;; Set clangd as C/C++ LSP
-(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))
+(set-eglot-client! 'cc-mode '("clangd" "-j=3" "--clang-tidy"))
 ;; Use relative line numbers (Usage: number <j/k>)
 (setq display-line-numbers-type 'relative)
 ;; Use pass as auth-source
diff --git a/init.el b/init.el
index a5c4891..dfaafea 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                 ; M-x vscode
+       (lsp +eglot)        ; M-x vscode
        ;;macos             ; MacOS-specific commands
        magit               ; a git porcelain for Emacs
        make                ; run make tasks from Emacs