diff --git a/modules/home/doom/static/config.el b/modules/home/doom/static/config.el
index b860494..ccf856a 100644
--- a/modules/home/doom/static/config.el
+++ b/modules/home/doom/static/config.el
@@ -194,9 +194,18 @@
     (add-to-list 'major-mode-remap-alist mapping)))
 
 ;; Integrate with legacy tree-sitter mode
-(after! tree-sitter
-  (add-hook! 'c++-ts-mode-hook #'tree-sitter-mode)
-  (add-hook! 'tree-sitter-mode-hook #'tree-sitter-hl-mode)
+(use-package! tree-sitter
+  :hook ((c++-ts-mode . tree-sitter-mode)
+         (c-ts-mode . tree-sitter-mode)
+         (c-or-c++-ts-mode . tree-sitter-mode)
+         (python-ts-mode . tree-sitter-mode)
+         (css-ts-mode . tree-sitter-mode)
+         (typescript-ts-mode . tree-sitter-mode)
+         (js-ts-mode . tree-sitter-mode)
+         (bash-ts-mode . tree-sitter-mode)
+         (json-ts-mode . tree-sitter-mode)
+         (tree-sitter-mode . tree-sitter-hl-mode))
+  :config
   (let (result)
     (dolist (mapping tree-sitter-major-mode-language-alist)
       (let* ((pre-mode (car mapping))
@@ -204,7 +213,9 @@
              (post-mode (cdr (assoc pre-mode mode-ts-mode-mapping))))
         (when post-mode
           (push (cons post-mode ts-lang) result))))
-    (add-to-list 'tree-sitter-major-mode-language-alist result)))
+    (dolist (mapping result)
+      (add-to-list 'tree-sitter-major-mode-language-alist mapping))))
+
 
 ;; Integrate with lsp-mode
 (use-package lsp-mode