diff options
| -rw-r--r-- | init.el | 22 | ||||
| -rw-r--r-- | lisp/general.el | 33 | ||||
| -rw-r--r-- | lisp/org-custom.el | 8 |
3 files changed, 45 insertions, 18 deletions
@@ -58,13 +58,25 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(custom-safe-themes - '("c650a74280e8ce4ae4b50835b7a3bc62aeffa202ffea82260e529f0a69027696" "6fc9e40b4375d9d8d0d9521505849ab4d04220ed470db0b78b700230da0a86c1" "b11edd2e0f97a0a7d5e66a9b82091b44431401ac394478beb44389cf54e6db28" "6bdc4e5f585bb4a500ea38f563ecf126570b9ab3be0598bdf607034bb07a8875" "f3781be0be23cc71c89b317489e07a4ad3e885f84c0a618692b53bbd69e60843" "0cf95236abcf59e05b1ea69b4edd53d293a5baec4fe4c3484543fee99bfd2204" "ec8ff5e2c8a9eb38e49a9bea6297c2194bbe0c03982630d66db1570f5ae83d90" "2ca3da7d36b0d326f984530a07be54b272b5c313b1361989acf747d8b5616162" "80214de566132bf2c844b9dee3ec0599f65c5a1f2d6ff21a2c8309e6e70f9242" "b3737f86b86d52c7d06820c10dc2609e9192627fc02dd654f4f9eb336f24f511" "a6f9dd4844bfbfaf1162f04ae3c52070154ef28d18b5d482566015cf429492b0" "f149d9986497e8877e0bd1981d1bef8c8a6d35be7d82cba193ad7e46f0989f6a" "3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e" default)) - '(package-selected-packages - '(helpful aider ultra-scroll dracula-theme color-theme-sanityinc-tomorrow catppuccin-theme ef-themes org-attach-screenshot eglot treemacs-nerd-icons treemacs-all-the-icons nerd-icons kaolin-themes ement dart-mode yaml-mode meson-mode autothemer pyenv-mode pyvenv plantuml-mode ledger-mode centered-window perfect-margin-mode org-download helm-rg htmlize mood-line org-super-agenda material-theme esup glsl-mode fast-scroll yasnippet-snippets jsdoc helm-slack slack smart-mode-line magit rust-mode xref-js2 web-mode vterm-toggle vscode-dark-plus-theme treemacs-projectile tree-sitter-langs tide tern smartparens rtags req-package rainbow-mode pythonic python-mode perfect-margin org-roam org-notify org-modern org-bullets org-alert minimap markdown-mode json-mode js2-refactor js2-highlight-vars js-doc ido-vertical-mode hl-todo highlight-thing highlight-indent-guides helm-projectile helm-posframe helm-ag good-scroll go-mode git-gutter-fringe git-commit flycheck-irony evil eslint-fix emojify eldoc-box drag-stuff doom-themes dashboard css-eldoc counsel company-quickhelp company-irony cmake-mode cmake-ide auctex all-the-icons ac-js2)) + '("c650a74280e8ce4ae4b50835b7a3bc62aeffa202ffea82260e529f0a69027696" + "6fc9e40b4375d9d8d0d9521505849ab4d04220ed470db0b78b700230da0a86c1" + "b11edd2e0f97a0a7d5e66a9b82091b44431401ac394478beb44389cf54e6db28" + "6bdc4e5f585bb4a500ea38f563ecf126570b9ab3be0598bdf607034bb07a8875" + "f3781be0be23cc71c89b317489e07a4ad3e885f84c0a618692b53bbd69e60843" + "0cf95236abcf59e05b1ea69b4edd53d293a5baec4fe4c3484543fee99bfd2204" + "ec8ff5e2c8a9eb38e49a9bea6297c2194bbe0c03982630d66db1570f5ae83d90" + "2ca3da7d36b0d326f984530a07be54b272b5c313b1361989acf747d8b5616162" + "80214de566132bf2c844b9dee3ec0599f65c5a1f2d6ff21a2c8309e6e70f9242" + "b3737f86b86d52c7d06820c10dc2609e9192627fc02dd654f4f9eb336f24f511" + "a6f9dd4844bfbfaf1162f04ae3c52070154ef28d18b5d482566015cf429492b0" + "f149d9986497e8877e0bd1981d1bef8c8a6d35be7d82cba193ad7e46f0989f6a" + "3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" + "a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e" + default)) + '(package-selected-packages nil) '(package-vc-selected-packages '((aider :url "https://github.com/tninja/aider.el"))) '(safe-local-variable-values - '((eval setq-local org-log-done 'time) - (js-indent-level . 4))) + '((eval setq-local org-log-done 'time) (js-indent-level . 4))) '(warning-suppress-types '((comp)))) (custom-set-faces ;; custom-set-faces was added by Custom. 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 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) |