diff options
| author | cashmere <cashmere@autistici.org> | 2026-02-18 05:54:58 +0100 |
|---|---|---|
| committer | cashmere <cashmere@autistici.org> | 2026-02-18 05:54:58 +0100 |
| commit | a0ab043567bf3cdc883c353c2fe6bf63701fbf1c (patch) | |
| tree | 02e6a68034a2284a2c976deabd3d1ab8eec56994 | |
| parent | 4000c2bdd94dc52714798576014e3f46d9c8664e (diff) | |
| download | emacs-a0ab043567bf3cdc883c353c2fe6bf63701fbf1c.tar.gz | |
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.
| -rw-r--r-- | config.el | 27 | ||||
| -rw-r--r-- | config.org | 15 | ||||
| -rw-r--r-- | init.el | 6 |
3 files changed, 21 insertions, 27 deletions
@@ -294,13 +294,11 @@ (setq dashboard-image-banner-max-height 256) (setq dashboard-bookmarks-show-base t) (setq dashboard-bookmarks-item-format "%s") - (setq dashboard-projects-backend 'project-el) - (setq dashboard-items '((bookmarks . 5) - (projects . 5) - (recents . 5))) - (setq dashboard-projects-switch-function - (lambda (proj) - (project-switch-project proj))) + (setq dashboard-projects-backend 'projectile) + (setq dashboard-items '((projects . 5) + (recents . 5) + (bookmarks . 5))) + (setq dashboard-projects-switch-function #'projectile-switch-project-by-name) (setq dashboard-center-content t) (setq dashboard-set-file-icons t) (setq dashboard-set-heading-icons t) @@ -617,7 +615,8 @@ :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)) (use-package flycheck-python-ruff :straight (:host github :repo "v4n6/flycheck-python-ruff") @@ -1557,7 +1556,6 @@ Works on the base filename (without extension), e.g. matches \"-agenda\", \":age (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)) (use-package which-key @@ -1777,8 +1775,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))) @@ -2532,11 +2529,13 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi '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 "")) @@ -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 "")) @@ -19,12 +19,6 @@ (straight-use-package '(project :type built-in)) (straight-use-package '(xref :type built-in)) -(straight-use-package '(eglot :type built-in)) -(straight-use-package '(flymake :type built-in)) -(straight-use-package '(jsonrpc :type built-in)) -(straight-use-package '(eldoc :type built-in)) -(straight-use-package '(external-completion :type built-in)) -(straight-use-package '(seq :type built-in)) (straight-use-package 'use-package) (setq straight-use-package-by-default t) |
