emacs/.emacs.d/config/init-ide.el

@@ -73,8 +73,6 @@
   (add-hook 'eglot-managed-mode-hook #'my-eglot-managed-hook)
   (add-to-list 'eglot-server-programs
                '(js-web-mode . ("typescript-language-server" "--stdio")))
-  (add-to-list 'eglot-server-programs
-               '(ts-web-mode . ("typescript-language-server" "--stdio")))
   (add-to-list 'eglot-server-programs
                `(html-web-mode . ,(eglot-alternatives
                                    '(("vscode-html-language-server" "--stdio")
@@ -229,7 +227,7 @@
   (typescript-mode . eglot-ensure)
   (python-mode . eglot-ensure)
   (js-web-mode . eglot-ensure)
-  (ts-web-mode . eglot-ensure)
+  (tsx-ts-mode . eglot-ensure)
   (html-web-mode . eglot-ensure)
   (scala-mode . eglot-ensure)
   (c-mode . eglot-ensure)

emacs/.emacs.d/config/init-js.el

@@ -33,4 +33,10 @@
                "C-c C-k" #'js-send-buffer
                "C-c M-z" #'js-send-buffer-and-go))
 
+(use-package typescript-mode
+  :mode ("\\.ts\\'"
+         "\\.mjs\\'")
+  :custom
+  (typescript-indent-level 2))
+
 (provide 'init-js)

emacs/.emacs.d/config/init-run-command.el

@@ -494,17 +494,6 @@
                                    :working-dir project
                                    :runner 'run-command-runner-vterm))))))))
 
-  (defun run-command-recipe-docker-compose ()
-    (when-let ((compose-dir (locate-dominating-file default-directory "compose.yaml")))
-      (list
-       (list :command-name "up"
-             :command-line "docker compose up"
-             :working-dir compose-dir)
-       (list :command-name "up --watch"
-             :command-line "docker compose up --watch"
-             :working-dir compose-dir
-             :runner 'run-command-runner-vterm))))
-
   :general
   (leader-map "'" #'run-command)
   (leader-map "\"" #'run-command-with-runner)
@@ -530,7 +519,6 @@
                          run-command-recipe-rake
                          run-command-recipe-scripts
                          run-command-recipe-rspec
-                         run-command-recipe-hummingbird
+                         run-command-recipe-hummingbird)))
-                         run-command-recipe-docker-compose)))
 
 (provide 'init-run-command)

emacs/.emacs.d/config/init-web.el

@@ -24,11 +24,6 @@
   "Web mode in JS files.")
 (add-to-list 'auto-mode-alist '("\\.jsx?\\'" . js-web-mode))
 
-(define-derived-mode ts-web-mode web-mode "TS Web Mode"
-  "Web mode in TypeScript files.")
-(add-to-list 'auto-mode-alist '("\\.tsx?\\'" . ts-web-mode))
-
-
 (define-derived-mode html-web-mode web-mode "HTML Web Mode"
   "Web mode in HTML files.")
 (add-to-list 'auto-mode-alist '("\\.html?\\'" . html-web-mode))

emacs/.emacs.d/config/init-yaml.el

@@ -7,6 +7,7 @@
   (add-hook 'yaml-ts-mode-hook #'highlight-indent-guides-mode))
 
 (use-package yaml-pro
+  :when (treesit-ready-p 'yaml)
   :hook (yaml-ts-mode . yaml-pro-ts-mode)
   :config
   (defun yaml-pro-edit-initialize-buffer-filter-args-advice (args)