From 9daef3c5bd02f2907985a2be5cbf173642f66e87 Mon Sep 17 00:00:00 2001 From: Rutherther Date: Mon, 17 Nov 2025 19:02:55 +0100 Subject: [PATCH] chore: remove eglot, matlab --- init.el | 57 +-------------------------------------------------------- 1 file changed, 1 insertion(+), 56 deletions(-) diff --git a/init.el b/init.el index 1642931e4b03fa96d064b045c4616e08d3b5a615..ab9272c59cb319b8c39ae45fe98f888d5fff5ff6 100644 --- a/init.el +++ b/init.el @@ -1264,25 +1264,6 @@ '("^\\*eldoc for" display-buffer-at-bottom (window-height . 4)))) -(my-use-package eglot - :ensure t - :commands (eglot eglot-ensure) - :hook - ((eglot-managed-mode . mp-eglot-eldoc)) - :custom - (eglot-ignored-server-capabilities '(:documentHighlightProvider)) - (eglot-stay-out-of '(imenu)) ; I prefer the ts imenu for now - :general - (normal eglot--managed-mode - :definer 'minor-mode - "gR" '(eglot-rename :wk "Rename identifier") - "g." '(eglot-code-actions :wk "Code actions")) - :preface - ; Thanks https://www.masteringemacs.org/article/seamlessly-merge-multiple-documentation-sources-eldoc - (defun mp-eglot-eldoc () - (setq eldoc-documentation-strategy - 'eldoc-documentation-compose-eagerly))) - (my-use-package lsp-mode :ensure t :commands (lsp lsp-mode) @@ -1557,44 +1538,10 @@ minibuffer, even without explicitly focusing it." :hook (julia-mode . julia-snail-mode)) -;; Matlab -(my-use-package matlab - :ensure matlab-mode - :commands matlab-mode - :mode "\\.m\\'" - :after eglot - :custom - (matlab-shell-run-region-function 'matlab-shell-region->script) - (matlab-shell-tab-use-company nil) - :general - (my-local-leader matlab-mode-map - "b" '(mlgud-break :wk "Breakpoint") - "x" '(mlgud-remove :wk "Remove breakpoint") - "c" '(matlab-shell-run-cell :wk "Run cell") - "r" '(matlab-shell-run-region :wk "Run region") - "v" '(matlab-shell-run-command :wk "Run command")) - (my-local-leader matlab-shell-gud-minor-mode-map - "b" '(mlgud-break :wk "Breakpoint") - "x" '(mlgud-remove :wk "Remove breakpoint") - "v" '(mlgud-list-breakpoints :wk "List breakpoints") - "s" '(mlgud-step :wk "Step") - "n" '(mlgud-next :wk "Next") - "f" '(mlgud-finish :wk "Finish function") - "c" '(mlgud-cont :wk "Continue") - "w" '(mlgud-show-stack :wk "Stack") - "e" '(matlab-shell-gud-show-symbol-value :wk "Symbol") - "q" '(mlgud-stop-subjob :wk "Quit")) - :config - (add-to-list 'eglot-server-programs - '(matlab-mode . ("matlab-language-server" "--stdio"))) - (my/indent-variable-mode-alist-add matlab-mode matlab-indent-level) - ) - - (my-use-package vhdl-mode :ensure nil :commands vhdl-mode - :after eglot + :after lsp-mode ;; :mode ;; Use vhdl-ts-mode instead ;; ("\\.vhdl?\\'" . vhdl-mode) @@ -1614,8 +1561,6 @@ minibuffer, even without explicitly focusing it." (vhdl-basic-offset 2) (vhdl-end-comment-column 300) :config - (add-to-list 'eglot-server-programs - '(vhdl-mode . ("vhdl_ls"))) (my/indent-variable-mode-alist-add vhdl-mode vhdl-basic-offset)