From a4b2503c2afacf9078e9ee863b8da5a208334dcf Mon Sep 17 00:00:00 2001 From: Rutherther Date: Thu, 13 Jun 2024 22:16:59 +0200 Subject: [PATCH] fix: some fixes --- init.el | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/init.el b/init.el index 881e2cecb6c0394e2e01303845f947ed120250fa..46483af6e1237bc80fbb12fd529e6f2a45d1e9db 100644 --- a/init.el +++ b/init.el @@ -146,10 +146,10 @@ (evil-undo-system 'undo-redo) (evil-want-integration t) (evil-want-keybinding nil) - :config + :init ; evil-want-Y-yank-to-eol cannot be set by custom. Use this instead (setq evil-want-Y-yank-to-eol t) - + :config (my-unbind-key-in-evil-states "C-.") (evil-mode 1)) @@ -388,6 +388,7 @@ ;; Configure a custom style dispatcher (see the Consult wiki) ;; (setq orderless-style-dispatchers '(+orderless-consult-dispatch orderless-affix-dispatch)) ;; orderless-component-separator #'orderless-escapable-split-on-space) + (orderless-matching-styles '(orderless-literal orderless-regexp orderless-flex)) (completion-styles '(orderless basic)) (completion-category-defaults nil) (completion-category-overrides '((file (styles partial-completion)))) @@ -695,6 +696,8 @@ (lsp-enable-snippet nil) + (lsp-completion-provider :none) + ;; Handled by envrc (lsp-enable-suggest-server-download nil) @@ -705,8 +708,17 @@ (lsp-enable-symbol-highlighting nil) (lsp-enable-links nil) (lsp-restart 'auto-restart) - :hook + (lsp-enable-folding nil) + (lsp-enable-text-document-color nil) + (lsp-enable-on-type-formatting nil) + (lsp-headerline-breadcrumb-enable nil) + :hook ( (lsp-mode . lsp-enable-which-key-integration) + ;; Fix orderless in lsp-mode https://magnus.therning.org/2024-05-04-orderless-completion-in-lsp-mode.html + (lsp-completion-mode . (lambda () + (setq-local completion-category-defaults + (assoc-delete-all 'lsp-capf completion-category-defaults)))) + ) :config ;; don't ping LSP lanaguage server too frequently (defvar lsp-on-touch-time 0) @@ -790,7 +802,8 @@ (vhdl-reset-kind 'sync) (vhdl-reset-name "rst_in") (vhdl-basic-offset 2) - (lsp-vhdl-server 'vhdl-ls)) + (lsp-vhdl-server 'vhdl-ls) +) (my-use-package vhdl-ts-mode :ensure t