From a9255c2feadbdc8b4da005e3aa8389b5798bda18 Mon Sep 17 00:00:00 2001
From: Tim McCarthy <thoomfish@gmail.com>
Date: Wed, 9 Sep 2026 12:08:38 -0700
Subject: [PATCH] Fix language mode configs

---
 emacs/init.el | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/emacs/init.el b/emacs/init.el
index 6a6b6a8..f22fd8f 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -856,10 +856,18 @@ EMACS-ALTERNATIVE is the Emacs equivalent (e.g., 'C-s')."
 (use-package treesit-auto
   :ensure t
   :custom
+  ;; Check and offer to install these grammars once at startup.
+  (treesit-auto-langs '(bash css dockerfile html javascript json python rust
+                            tsx typescript yaml))
   (treesit-auto-install 'prompt)
-  :hook (prog-mode . treesit-auto-mode)
   :config
-  (treesit-auto-add-to-auto-mode-alist 'all))
+  ;; Use treesit-auto for grammar recipes, without its per-file scanning.
+  (global-treesit-auto-mode -1)
+  (treesit-auto-install-all)
+  (setq major-mode-remap-alist
+        (treesit-auto--build-major-mode-remap-alist))
+  ;; Register only modes whose grammars are available.
+  (treesit-auto-add-to-auto-mode-alist))
 
 ;;;; Markdown
 (use-package markdown-mode
@@ -880,22 +888,11 @@ EMACS-ALTERNATIVE is the Emacs equivalent (e.g., 'C-s')."
 
 (keymap-global-set "C-c o r" #'copy-source-for-reddit)
 
-;;;; YAML
-(use-package yaml-mode
-  :ensure t)
-
-;;;;
+;;;; CSV
 (use-package csv-mode
   :ensure t)
 
-;;;; Rust
-(use-package rust-mode
-  :ensure t)
-
 ;;;; Python
-(setq major-mode-remap-alist
-      '((python-mode . python-ts-mode)))
-
 (use-package lsp-pyright
   :ensure t
   :custom (lsp-pyright-langserver-command "basedpyright")
@@ -906,10 +903,6 @@ EMACS-ALTERNATIVE is the Emacs equivalent (e.g., 'C-s')."
 (setq lsp-pylsp-plugins-flake8-ignore '("D100" "D101" "D102"))
 
 
-;;;; Docker
-(use-package dockerfile-mode
-  :ensure t)
-
 ;;;; LSP
 (use-package lsp-mode
   :ensure t
@@ -992,8 +985,6 @@ EMACS-ALTERNATIVE is the Emacs equivalent (e.g., 'C-s')."
 (use-package svelte-mode
   :ensure t)
 
-(use-package typescript-mode
-  :ensure t)
 ;;; Eshell
 ;;;; Eshell
 (require 'cl-lib)