From d8d0f6c38bdaaba101c5a0a96a3f0ce7244d064b Mon Sep 17 00:00:00 2001 From: simponic Date: Thu, 1 Feb 2024 15:37:34 -0500 Subject: [PATCH] Update .emacs.d/settings.org --- .emacs.d/settings.org | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/.emacs.d/settings.org b/.emacs.d/settings.org index be49f62..3001032 100644 --- a/.emacs.d/settings.org +++ b/.emacs.d/settings.org @@ -277,7 +277,8 @@ must run ~(all-the-icons-install-fonts)~ and ~(nerd-fonts-install-fonts)~ (java-mode . lsp) (php-mode . lsp) (c-mode . lsp) - (typescript-mode . lsp) + (typescript-ts-mode . lsp) + (tsx-ts-mode . lsp) (lsp-mode . lsp-enable-which-key-integration)) :config (progn (lsp-register-custom-settings @@ -351,36 +352,12 @@ After installing the ~rust-analyzer~, the following can be used: (setq lsp-rust-server 'rust-analyzer) #+END_SRC *** Web Stuff -**** typescript-mode -#+BEGIN_SRC emacs-lisp - (use-package typescript-mode - :ensure t) - (setq typescript-indent-level 2) -#+END_SRC **** astro #+BEGIN_SRC emacs-lisp (use-package astro-ts-mode :ensure t) ;; note - do treesit-install-language-grammar astro @ https://github.com/virchau13/tree-sitter-astro #+END_SR -**** TIDE -#+BEGIN_SRC emacs-lisp - (defun setup-tide-mode () - (interactive) - (tide-setup) - (flycheck-mode +1) - (setq flycheck-check-syntax-automatically '(save mode-enabled)) - (eldoc-mode +1) - (tide-hl-identifier-mode +1) - (company-mode +1)) - - (use-package tide - :ensure t - :after (typescript-mode company flycheck) - :hook ((typescript-mode . setup-tide-mode) ;; TODO: Update to tree-sitter in Emacs 29 - (js2-mode . setup-tide-mode))) -#+END_SRC - **** Web Mode #+BEGIN_SRC emacs-lisp (setq web-mode-markup-indent-offset 2)