Readding instant company completions

1 files changed, 24 insertions, 9 deletions

diff --git a/lisp/general.el b/lisp/general.el
index 884003a..a43bedb 100644
--- a/lisp/general.el
+++ b/lisp/general.el
@@ -2,6 +2,7 @@
 
 (set-language-environment "UTF-8")
 (set-default-coding-systems 'utf-8)
+(add-to-list 'exec-path (expand-file-name "~/.cargo/bin")) 
 
 ;; Initialization screen
 (setq fancy-splash-image "~/.emacs.d/images/true.png")
@@ -243,18 +244,17 @@
         company-tooltip-limit           10
         company-backends                '((company-capf company-gtags company-elisp company-css company-dabbrev company-nxml))
         company-dabbrev-downcase nil
-        company-idle-delay nil
+        company-idle-delay 0.1
         )
-  (define-key company-mode-map (kbd "M-c") #'company-complete)
   )
 
-;; (use-package company-quickhelp
-;;   :ensure t
-;;   :defer t
-;;   :init (company-quickhelp-mode 1)
-;;   :config
-;;   (setq company-quickhelp-color-background (face-attribute 'default :background))
-;;   )
+(use-package company-quickhelp
+  :ensure t
+  :defer t
+  :init (company-quickhelp-mode 1)
+  :config
+  (setq company-quickhelp-color-background (face-attribute 'default :background))
+  )
 
 ;; Eglot
 (use-package eglot
@@ -265,6 +265,20 @@
   :config
   (add-to-list 'eglot-server-programs '((c++-mode c-mode) "clangd-18"))
   (add-to-list 'eglot-server-programs `((dart-mode) "/home/matthew/Github/flutter/bin/dart" "language-server"))
+
+  (defun my-eglot-disable-on-type-formatting (orig-fn &rest args)
+    "Disable on-type formatting by pretending the server doesn't support it."
+    (let ((inhibit-message t))
+      (cl-letf* (((symbol-function 'eglot--server-capable)
+                  (lambda (cap)
+                    (if (equal cap :documentOnTypeFormattingProvider)
+                        nil
+                      (funcall #'eglot--server-capable cap)))))
+        (apply orig-fn args))))
+
+  (advice-add 'eglot--on-type-formatting :around #'my-eglot-disable-on-type-formatting)
+
+
   (add-hook 'c-mode-common-hook 'eglot-ensure)
   (add-hook 'dart-mode-hook 'eglot-ensure)
   (advice-add 'jsonrpc--log-event :override #'ignore))
@@ -322,5 +336,6 @@
   :config
   (ultra-scroll-mode 1))
 
+
 (provide 'general)
 ;;; general.el ends here