Some general improvements for web mode, need to test them out on a real project though

1 files changed, 2 insertions, 20 deletions

diff --git a/lisp/cpp.el b/lisp/cpp.el
index 3565a16..1fdbb7c 100644
--- a/lisp/cpp.el
+++ b/lisp/cpp.el
@@ -12,30 +12,12 @@
   ;; (electric-indent-mode 0)
   )
 
-;; Irony mode.
-(use-package irony
-  :ensure t
-  :defer t
-  :init
-  (add-hook 'c++-mode-hook 'irony-mode)
-  (add-hook 'c-mode-hook 'irony-mode)
-  (add-hook 'objc-mode-hook 'irony-mode)
-  :config
-  ;; replace the `completion-at-point' and `complete-symbol' bindings in
-  ;; irony-mode's buffers by irony-mode's function
-  (defun my-irony-mode-hook ()
-    (define-key irony-mode-map [remap completion-at-point]
-	  'irony-completion-at-point-async)
-    (define-key irony-mode-map [remap complete-symbol]
-	  'irony-completion-at-point-async))
-  (add-hook 'irony-mode-hook 'my-irony-mode-hook)
-  (add-hook 'irony-mode-hook 'irony-cdb-autosetup-compile-options)
-  )
-
 (require 'cmake-ide)
+(require 'eglot)
 (cmake-ide-setup)
 
 (add-hook 'c-mode-common-hook 'setup-c)
+(add-hook 'c-mode-common-hook 'eglot-ensure)
 
 (provide 'cpp)
 ;;; cpp.el ends here