3 files changed, 5 insertions, 17 deletions
diff --git a/users/tazjin/emacs/config/init.el b/users/tazjin/emacs/config/init.el
index 7333a0b5df35..1c584f9ea872 100644
--- a/users/tazjin/emacs/config/init.el
+++ b/users/tazjin/emacs/config/init.el
@@ -123,7 +123,7 @@
          (cargo-process-mode . visual-line-mode))
   :bind (:map cargo-mode-map ("C-c C-c C-l" . ignore)))
 
-(use-package dockerfile-mode)
+(use-package dockerfile-ts-mode)
 
 (use-package erlang
   :hook ((erlang-mode . (lambda ()
@@ -154,8 +154,6 @@
   :hook ((kotlin-mode . (lambda ()
                           (setq indent-line-function #'indent-relative)))))
 
-(use-package lsp-mode)
-
 (use-package markdown-mode
   :config
   (add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode))
@@ -187,7 +185,7 @@
   :hook (telega-chat-mode . company-mode))
 
 (use-package terraform-mode)
-(use-package toml-mode)
+(use-package toml-ts-mode)
 
 (use-package tvl)
 
@@ -196,7 +194,7 @@
   (vertico-mode))
 
 (use-package web-mode)
-(use-package yaml-mode)
+(use-package yaml-ts-mode)
 (use-package zoxide)
 
 (use-package passively
diff --git a/users/tazjin/emacs/config/settings.el b/users/tazjin/emacs/config/settings.el
index 5c7b47f60c87..0ab15a5ac6bf 100644
--- a/users/tazjin/emacs/config/settings.el
+++ b/users/tazjin/emacs/config/settings.el
@@ -49,7 +49,7 @@
 (add-to-list 'auto-mode-alist '("\\.star\\'" . python-mode))
 
 ;; Use cmake-mode for relevant files.
-(add-to-list 'auto-mode-alist '("ya\\.make\\'" . cmake-mode))
+(add-to-list 'auto-mode-alist '("ya\\.make\\'" . cmake-ts-mode))
 
 ;; Use tree-sitter modes for various languages.
 (setq major-mode-remap-alist
diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix
index fbec3a9e4fb5..cd805996bfdf 100644
--- a/users/tazjin/emacs/default.nix
+++ b/users/tazjin/emacs/default.nix
@@ -25,6 +25,7 @@ pkgs.makeOverridable
       tree-sitter-c
       tree-sitter-cmake
       tree-sitter-cpp
+      tree-sitter-dockerfile
       tree-sitter-go
       tree-sitter-java
       tree-sitter-json
@@ -44,18 +45,14 @@ pkgs.makeOverridable
       browse-kill-ring
       cargo
       clojure-mode
-      cmake-mode
       company
       consult
-      d-mode
       deft
       direnv
-      dockerfile-mode
       elixir-mode
       elm-mode
       erlang
       exwm
-      flymake
       go-mode
       google-c-style
       gruber-darker-theme
@@ -67,11 +64,8 @@ pkgs.makeOverridable
       jq-mode
       kotlin-mode
       kubernetes
-      lsp-mode
       magit
       markdown-toc
-      meson-mode
-      multi-term
       multiple-cursors
       nginx-mode
       nix-mode
@@ -79,7 +73,6 @@ pkgs.makeOverridable
       paredit
       password-store
       pinentry
-      polymode
       prescient
       protobuf-mode
       rainbow-delimiters
@@ -91,9 +84,7 @@ pkgs.makeOverridable
       string-edit-at-point
       telephone-line
       terraform-mode
-      toml-mode
       undo-tree
-      use-package
       uuidgen
       vertico
       vterm
@@ -101,7 +92,6 @@ pkgs.makeOverridable
       websocket
       which-key
       xelb
-      yaml-mode
       yasnippet
       zetteldeft
       zoxide