simplified config a bit

This commit is contained in:
2026-07-30 20:21:27 +02:00
parent 93ff4a2e36
commit 811637003b
10 changed files with 51 additions and 182 deletions
+20 -15
View File
@@ -30,10 +30,7 @@
:weight 'bold))
;; Tree-sitter hooks
(dolist (hook '(c-ts-mode-hook c++-ts-mode-hook java-ts-mode-hook rust-ts-mode-hook
go-ts-mode-hook ruby-ts-mode-hook js-ts-mode-hook typescript-ts-mode-hook
tsx-ts-mode-hook css-ts-mode-hook html-ts-mode-hook bash-ts-mode-hook
cmake-ts-mode-hook dockerfile-ts-mode-hook json-ts-mode-hook toml-ts-mode-hook yaml-ts-mode-hook))
(dolist (hook '(c-ts-mode-hook c++-ts-mode-hook java-ts-mode-hook rust-ts-mode-hook go-ts-mode-hook ruby-ts-mode-hook js-ts-mode-hook typescript-ts-mode-hook tsx-ts-mode-hook css-ts-mode-hook html-ts-mode-hook bash-ts-mode-hook cmake-ts-mode-hook dockerfile-ts-mode-hook json-ts-mode-hook toml-ts-mode-hook yaml-ts-mode-hook))
(add-hook hook #'treesit-fold-mode))
(with-eval-after-load 'treesit
@@ -44,23 +41,31 @@
:config
(mason-setup))
(defvar my/lsp-mode-hooks
'(c-mode-hook
c++-mode-hook
c-ts-mode-hook
c++-ts-mode-hook
typescript-ts-mode-hook
js-ts-mode-hook
tsx-ts-mode-hook
arduino-mode-hook
toml-ts-mode-hook
json-ts-mode-hook
python-mode-hook)
"List of major mode hooks to enable LSP.")
(dolist (hook my/lsp-mode-hooks)
(add-hook hook #'lsp-deferred))
(use-package lsp-mode
:defer t
:hook ((c-mode . lsp-deferred)
(c++-mode . lsp-deferred)
(c-ts-mode . lsp-deferred)
(c++-ts-mode . lsp-deferred)
(typescript-ts-mode . lsp-deferred)
(js-ts-mode . lsp-deferred)
(tsx-ts-mode . lsp-deferred)
(arduino-mode . lsp-deferred)
(toml-ts-mode . lsp-deferred)
(json-ts-mode . lsp-deferred)
(lsp-mode . lsp-enable-which-key-integration))
:commands lsp
:init
(setq lsp-keymap-prefix "C-l")
:config
(add-hook 'lsp-mode-hook #'lsp-enable-which-key-integration))
(setq lsp-clients-clangd-executable "clangd"
lsp-clangd-binary-path "/usr/bin/clangd"
lsp-clients--clangd-default-executable "/usr/bind/clangd"