From a0ab043567bf3cdc883c353c2fe6bf63701fbf1c Mon Sep 17 00:00:00 2001 From: cashmere Date: Wed, 18 Feb 2026 05:54:58 +0100 Subject: fix eglot timer errors: remove ELPA overrides for built-in packages straight-use-package with :type built-in for eglot, flymake, jsonrpc, eldoc, external-completion, and seq was pulling newer ELPA versions (eglot 1.21 vs built-in 1.17.30) that are incompatible with flycheck-eglot and the existing config. Removed those declarations and deleted the straight repos/builds so Emacs 30.2 built-ins are used. Also: fix flycheck-rust-setup to only run in rust-mode buffers, remove tmr-mode-line-mode (conflicts with maple-modeline tab-line), and update tmr-timer segment to query timers directly. --- config.org | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'config.org') diff --git a/config.org b/config.org index df070d8..959b621 100644 --- a/config.org +++ b/config.org @@ -732,7 +732,8 @@ Not necessary but an eyecandy to look at! :ensure t :config (setq flycheck-rust-check-tests nil) - (add-hook 'flycheck-mode-hook #'flycheck-rust-setup)) + (add-hook 'rust-mode-hook #'flycheck-rust-setup) + (add-hook 'rust-ts-mode-hook #'flycheck-rust-setup)) #+end_src ** flycheck-ruff @@ -1883,7 +1884,6 @@ Some goodies for better integration with org files. (setq tmr-sound-file "/usr/share/sounds/freedesktop/stereo/alarm-clock-elapsed.oga" tmr-notification-urgency 'normal tmr-description-list 'tmr-description-history) - (tmr-mode-line-mode 1) (define-key global-map (kbd "C-c t") #'tmr-prefix-map)) #+end_src @@ -2160,8 +2160,7 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi (add-hook 'eglot-managed-mode-hook (lambda () - (eglot-inlay-hints-mode -1) - (eglot-semantic-tokens-mode 1))) + (eglot-inlay-hints-mode -1))) (setq eglot-ignored-server-capabilities '(:inlayhintprovider :documenthighlightprovider))) @@ -3442,11 +3441,13 @@ ily <3. 'local-map (make-mode-line-mouse-map 'mouse-1 'org-clock-goto))))) (maple-modeline-define-segment tmr-timer - :if (and (bound-and-true-p tmr-mode-line-mode) - (fboundp 'tmr-mode-line--get-active-timers) + :if (and (fboundp 'tmr-mode-line--get-active-timers) (tmr-mode-line--get-active-timers)) :format - (string-trim (or tmr-mode-line-string ""))) + (let* ((timer (car (tmr-mode-line--get-active-timers))) + (remaining (tmr-mode-line--format-remaining timer)) + (desc (tmr-mode-line--format-description timer))) + (concat remaining desc))) (maple-modeline-define my-custom-style :left ((evil :left (bar :left "")) -- cgit v1.3.1