diff --git a/flakes/emacs/config/init.el b/flakes/emacs/config/init.el index 2fcf8ee..1d636c7 100644 --- a/flakes/emacs/config/init.el +++ b/flakes/emacs/config/init.el @@ -156,6 +156,7 @@ (js-mode . eglot-ensure) (js-ts-mode . eglot-ensure) (json-mode . eglot-ensure) + (json-ts-mode . eglot-ensure) (typescript-ts-mode . eglot-ensure) (nix-mode . eglot-ensure)) :custom @@ -169,9 +170,11 @@ :documentOnTypeFormattingProvider :colorProvider :foldingRangeProvider)) - (add-to-list 'eglot-server-programs - '((json-mode js-mode js-ts-mode) . - ("vscode-json-languageserver" "--stdio")))) + :config + (dolist (mode '(json-mode json-ts-mode)) + (add-to-list 'eglot-server-programs + `(,mode . ("vscode-json-language-server" "--stdio")) + 0))) (use-package emacs :ensure nil @@ -345,9 +348,6 @@ (js-chain-indent t) (js-indent-level 2)) -(use-package json-mode - :defer t) - (use-package ligature :after fontaine :config @@ -707,7 +707,7 @@ typescript tsx javascript - jsx)) + json)) (treesit-auto-add-to-auto-mode-alist 'all) (global-treesit-auto-mode))