summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/general.el36
-rw-r--r--lisp/org-custom.el8
2 files changed, 28 insertions, 16 deletions
diff --git a/lisp/general.el b/lisp/general.el
index 884003a..11882b8 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")
@@ -222,9 +223,6 @@
(define-fringe-bitmap 'git-gutter-fr:modified [224] nil nil '(center repeated))
(define-fringe-bitmap 'git-gutter-fr:deleted [128 192 224 240] nil nil 'bottom))
-(use-package magit
- :ensure t)
-
;; icons
(use-package all-the-icons
:ensure t
@@ -243,18 +241,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 +262,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 +333,6 @@
:config
(ultra-scroll-mode 1))
+
(provide 'general)
;;; general.el ends here
diff --git a/lisp/org-custom.el b/lisp/org-custom.el
index 2af529a..d927a7c 100644
--- a/lisp/org-custom.el
+++ b/lisp/org-custom.el
@@ -32,10 +32,10 @@
;; (org-bullets-mode 1)
;; )
- (use-package org-modern
- :ensure t
- :config
- (global-org-modern-mode))
+ (use-package org-modern
+ :ensure t
+ :config
+ (global-org-modern-mode))
(setq org-ellipsis "…")
(set-face-attribute 'org-ellipsis nil :inherit 'default :box nil)