diff options
| author | tslil <tslil@posteo.de> | 2026-08-27 13:52:57 +0100 |
|---|---|---|
| committer | tslil <tslil@posteo.de> | 2026-08-27 14:01:35 +0100 |
| commit | 83cc72eb5b6c669eada0f18c07832af81053b20e (patch) | |
| tree | 3bf4f7012abbf045527696e27a752e1a176f4612 /emacs | |
| parent | e22dc65d78e08e90280502a29459cc1598847a19 (diff) | |
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/inits/20-programming.el | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/emacs/inits/20-programming.el b/emacs/inits/20-programming.el index e7385ba..cd2dc14 100644 --- a/emacs/inits/20-programming.el +++ b/emacs/inits/20-programming.el @@ -1,6 +1,6 @@ ;;; -*- lexical-binding: t -*- -;; Time-stamp: <2026-08-15 16h16 BST (7b97f8ba)> +;; Time-stamp: <2026-08-27 14h00 BST (82909977)> ;; ----------------------------------------------------------------------------- ;; General setup @@ -33,12 +33,12 @@ '((typescript-ts-mode tsx-ts-mode) . ("typescript-language-server" "--stdio"))) ) -(use-package treesit-auto - :custom - (treesit-auto-install 'prompt) - :config - (setq treesit-auto-langs '(python typescript tsx)) - (global-treesit-auto-mode)) +(setopt treesit-auto-install-grammar 'ask + treesit-enabled-modes '(python-ts-mode + typescript-ts-mode + tsx-ts-mode + json-ts-mode + toml-ts-mode)) (use-package centered-window :defer @@ -281,28 +281,24 @@ ;; ------------------------------------------------------------------- ;; Misc languages -(use-package json-mode +(use-package json-ts-mode :ensure :defer - :hook (json-mode . (lambda () - (programming-setup) - (setq standard-indent 2) - (setq js-indent-level 2) - (setq tab-width 2 - indent-tabs-mode nil))) - :bind (:map json-mode-map + :hook (json-ts-mode . (lambda () + (programming-setup) + (setq standard-indent 2) + (setq js-indent-level 2) + (setq tab-width 2 + indent-tabs-mode nil))) + :bind (:map json-ts-mode-map ("C-c C-f" . nil))) - -(use-package reformatter - :ensure t - :config - (reformatter-define oxfmt - :program "pnpm" - :args (list "exec" - "oxfmt" - "--stdin-filepath" - (or buffer-file-name (buffer-name))))) +(reformatter-define oxfmt + :program "pnpm" + :args (list "exec" + "oxfmt" + "--stdin-filepath" + (or buffer-file-name (buffer-name)))) (defun my-jtsx-setup () (eglot-ensure) |