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
-18
View File
@@ -12,12 +12,6 @@
(corfu-auto-prefix 2)
(corfu-popupinfo-delay '(0.5 . 0.3)))
;; (use-package corfu-terminal
;; :after corfu
;; :init
;; (unless (display-graphic-p)
;; (corfu-terminal-mode +1)))
(use-package vertico
:init
(vertico-mode)
@@ -30,18 +24,6 @@
(consult-completion-in-region grid)))
)
;; Configure directory extension.
(use-package vertico-directory
:after vertico
:ensure nil
;; More convenient directory navigation commands
:bind (:map vertico-map
("RET" . vertico-directory-enter)
("DEL" . vertico-directory-delete-char)
("M-DEL" . vertico-directory-delete-word))
;; Tidy shadowed file names
:hook (rfn-eshadow-update-overlay . vertico-directory-tidy))
(use-package vertico-posframe
:after vertico
:config
+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"
+8 -5
View File
@@ -11,14 +11,17 @@
(use-package surround
:defer t
:bind-keymap ("M-'" . surround-keymap)) ; Or bind to a prefix in general-def
:bind-keymap ("M-'" . surround-keymap))
(use-package kirigami
:defer t
:commands (kirigami-open-fold kirigami-open-fold-rec kirigami-close-fold
kirigami-toggle-fold kirigami-open-folds
kirigami-close-folds-except-current
kirigami-close-folds))
:commands (kirigami-open-fold
kirigami-open-fold-rec
kirigami-close-fold
kirigami-toggle-fold
kirigami-open-folds
kirigami-close-folds-except-current
kirigami-close-folds))
(use-package embark
:defer t
+2 -15
View File
@@ -20,23 +20,10 @@ t
(setq highlight-parentheses-colors
'("grey95" "#111" "#333" "#666")
highlight-parentheses-background-colors
'("#111" "blue" "green" "red")
'("pink" "blue" "green" "red")
)
)
(use-package indent-bars
:config
(setq indent-bars-prefer-character ?.
indent-bars-pattern "true"
indent-bars-width-frac 1
indent-bars-pad-frac 0.2
indent-bars-color-by-depth '(:regexp "outline-\\([0-9]+\\)" :blend 0.9)
indent-bars-highlight-current-depth '(:face default :blend 0.4))
;(add-hook 'prog-mode-hook #'indent-bars-mode)
:hook (prog-mode . indent-bars-mode))
(use-package colorful-mode
:defer t
:config (setq colorful-allow-mouse-clicks nil))
@@ -47,7 +34,7 @@ t
(window-setup . doom-modeline-mode)
:config
(setq
doom-modeline-minor-modes t
;doom-modeline-minor-modes t
doom-modeline-indent-info t
doom-modeline-column-zero-based t
doom-modeline-position-column-line-format '("%l:%c"))