Moving eglot to one central location and no longer centering windows

2 files changed, 4 insertions, 13 deletions

diff --git a/lisp/cpp.el b/lisp/cpp.el
index ab8cffc..d7a58e7 100644
--- a/lisp/cpp.el
+++ b/lisp/cpp.el
@@ -12,12 +12,6 @@
   ;; (electric-indent-mode 0)
   )
 
-(use-package eglot
-  :ensure t
-  :config
-  (add-hook 'c-mode-common-hook 'eglot-ensure)
-  )
-
 (add-hook 'c-mode-common-hook 'setup-c)
 
 (defun create-cpp-class()
diff --git a/lisp/general.el b/lisp/general.el
index 9ea8067..71156f4 100644
--- a/lisp/general.el
+++ b/lisp/general.el
@@ -284,7 +284,10 @@
   :custom
   (eglot-autoshutdown t)
   :ensure t
-  :bind ("<f2>" . #'eglot-rename))
+  :bind ("<f2>" . #'eglot-rename)
+  :config
+  (add-to-list 'eglot-server-programs '((c++-mode c-mode) "clangd"))
+  (add-hook 'c-mode-common-hook 'eglot-ensure))
 
 (set-face-underline 'eglot-highlight-symbol-face t)
 
@@ -363,11 +366,5 @@
 (use-package yasnippet-snippets
   :ensure t)
 
-(use-package centered-window
-  :ensure t
-  :config
-  (setq cwm-centered-window-width 180)
-  (centered-window-mode t))
-
 (provide 'general)
 ;;; general.el ends here