fixed ts-mode usage and use-package for file-mode associations

removed treesit-auto for now. didn't work and wasn't necessary,
biggest problem is knowing there's a ts version and fetching
it. otherwise, built in major-mode-remap-alist seems to be fine
This commit is contained in:
2026-08-19 23:20:36 +02:00
parent 8b769c72fa
commit 3693081e32
3 changed files with 38 additions and 22 deletions
+31 -5
View File
@@ -153,8 +153,8 @@
;; --- File & Buffer Handling --- ;; --- File & Buffer Handling ---
find-file-visit-truename t find-file-visit-truename t
vc-follow-symlinks t vc-follow-symlinks t
recentf-max-saved-items 100 recentf-max-saved-items 150
history-length 300 history-length 500
savehist-additional-variables '(kill-ring search-ring) savehist-additional-variables '(kill-ring search-ring)
;; --- Undo System --- ;; --- Undo System ---
@@ -247,11 +247,37 @@
(add-hook hook (lambda () (buffer-face-set '(:family "Noto Sans" :height 140))))) (add-hook hook (lambda () (buffer-face-set '(:family "Noto Sans" :height 140)))))
;; File Associations ;; File Associations
(add-to-list 'auto-mode-alist '("\\.qd$" . markdown-mode))
(add-to-list 'auto-mode-alist '("\\.ino$" . c++-mode))
(add-to-list 'auto-mode-alist '("\\.ts$" . typescript-ts-mode))
(add-to-list 'term-file-aliases '("xterm-256" . "xterm")) (add-to-list 'term-file-aliases '("xterm-256" . "xterm"))
(use-package markdown-mode
:mode "\\.qd$")
(use-package c++-mode
:mode "\\.ino$")
(use-package typescript-ts-mode
:mode "\\.ts$")
(use-package js-ts-mode
:mode "\\.json$")
(setq major-mode-remap-alist
'((c-mode . c-ts-mode)
(c++-mode . c++-ts-mode)
(cmake-mode . cmake-ts-mode)
(css-mode . css-ts-mode)
(java-mode . java-ts-mode)
(javascript-mode . js-ts-mode)
(js-mode . js-ts-mode)
(js2-mode . js-ts-mode)
(json-mode . json-ts-mode)
(python-mode . python-ts-mode)
(ruby-mode . ruby-ts-mode)
(rust-mode . rust-ts-mode)
(sh-mode . bash-ts-mode)
(typescript-mode . typescript-ts-mode)
(yaml-mode . yaml-ts-mode)))
;; Visual Finalization ;; Visual Finalization
(add-hook (add-hook
'window-setup-hook 'window-setup-hook
-1
View File
@@ -88,7 +88,6 @@
;; CODE ANALYSIS & VISUALS ;; CODE ANALYSIS & VISUALS
;; ============================================================================== ;; ==============================================================================
(elpaca treesit-auto) ; automatically install treesitter grammars
(elpaca treesit-fold) ; folding based on treesit (elpaca treesit-fold) ; folding based on treesit
(elpaca highlight-quoted) ; emacs (elpaca highlight-quoted) ; emacs
(elpaca highlight-defined) ; emacs (elpaca highlight-defined) ; emacs
+6 -15
View File
@@ -1,14 +1,5 @@
;; Tree-sitter & LSP tweaks (Core transformative changes) ;; Tree-sitter & LSP tweaks (Core transformative changes)
(use-package treesit-auto
:functions global-treesit-auto-mode
:config
(treesit-auto-add-to-auto-mode-alist 'all)
:hook (after-init . global-treesit-auto-mode)
:custom
(treesit-auto-install 'prompt)
)
(use-package treesit-fold (use-package treesit-fold
:defer t :defer t
:commands (treesit-fold-close :commands (treesit-fold-close
@@ -27,7 +18,8 @@
(set-face-attribute 'treesit-fold-replacement-face nil (set-face-attribute 'treesit-fold-replacement-face nil
:foreground "#808080" :foreground "#808080"
:box nil :box nil
:weight 'bold)) :weight 'bold)
)
;; Tree-sitter hooks ;; 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))
@@ -43,9 +35,8 @@
(defvar my/lsp-mode-hooks (defvar my/lsp-mode-hooks
'(c-mode-hook ;List of major mode hooks to enable LSP.
c++-mode-hook '(c-ts-mode-hook
c-ts-mode-hook
c++-ts-mode-hook c++-ts-mode-hook
typescript-ts-mode-hook typescript-ts-mode-hook
js-ts-mode-hook js-ts-mode-hook
@@ -53,8 +44,8 @@
arduino-mode-hook arduino-mode-hook
toml-ts-mode-hook toml-ts-mode-hook
json-ts-mode-hook json-ts-mode-hook
python-mode-hook) python-ts-mode-hook)
"List of major mode hooks to enable LSP.") )
(dolist (hook my/lsp-mode-hooks) (dolist (hook my/lsp-mode-hooks)
(add-hook hook #'lsp-deferred)) (add-hook hook #'lsp-deferred))