Add ccls, but configure it so it actually works this time

3 files changed, 17 insertions, 1 deletions

diff --git a/.config/emacs/modules/bd--devel.el b/.config/emacs/modules/bd--devel.el
index 7c0698d..d023223 100644
--- a/.config/emacs/modules/bd--devel.el
+++ b/.config/emacs/modules/bd--devel.el
@@ -116,6 +116,17 @@
 (require 'geiser-mode)
 (require 'geiser-guile)
 
+(use-package eglot
+  :defer t
+  :hook ((c-mode . eglot-ensure)
+	 (c++-mode . eglot-ensure))
+  :bind (:map eglot-mode-map
+	      ("C-c C-f" . eglot-format)
+	      ("C-c C-e" . eglot-rename))
+  :config
+  (add-to-list 'eglot-server-programs
+               '(c-mode . ("ccls" "--init={\"clang\": {\"extraArgs\": [\"-std=c++20\"]}}"))))
+
 (use-package rainbow-mode
   :hook css-mode)
 
diff --git a/.config/emacs/modules/bd--minibuffer.el b/.config/emacs/modules/bd--minibuffer.el
index 2300a1e..b3c98fe 100644
--- a/.config/emacs/modules/bd--minibuffer.el
+++ b/.config/emacs/modules/bd--minibuffer.el
@@ -27,7 +27,10 @@
 
 (use-package completion-preview
   :hook
-  ((comint-mode)))
+  ((comint-mode . completion-preview-mode)
+   (c-mode . completion-preview-mode)
+   (c++-mode . completion-preview-mode)
+   (emacs-lisp-mode . completion-preview-mode)))
 
 (use-package selector
   :demand t
diff --git a/.config/guix/modules/services/emacs.scm b/.config/guix/modules/services/emacs.scm
index b65cc3c..6104e2b 100644
--- a/.config/guix/modules/services/emacs.scm
+++ b/.config/guix/modules/services/emacs.scm
@@ -43,6 +43,8 @@
 
    aspell
    aspell-dict-en
+
+   ccls
    ))