diff --git a/flakes/emacs/config/init.el b/flakes/emacs/config/init.el
index c4a6134..d9cc517 100644
--- a/flakes/emacs/config/init.el
+++ b/flakes/emacs/config/init.el
@@ -117,6 +117,8 @@
 (use-package dockerfile-mode
   :defer t)
 
+(use-package eat)
+
 (use-package ediff
   :config
   (setq
@@ -620,11 +622,6 @@
    swift-mode:basic-offset 2
    swift-mode:repl-executable "xcrun swift repl"))
 
-(use-package swift-ts-mode
-  :config
-  (setq swift-ts-mode-indent-offset 2)
-  (add-hook 'swift-ts-mode-hook #'subword-mode))
-
 (use-package tab-bar
   :config
   (tab-bar-mode)
diff --git a/flakes/emacs/home.nix b/flakes/emacs/home.nix
index f302561..b452105 100644
--- a/flakes/emacs/home.nix
+++ b/flakes/emacs/home.nix
@@ -34,6 +34,7 @@
       })
       corfu
       dockerfile-mode
+      eat
       ef-themes
       eglot
       envrc
@@ -72,16 +73,6 @@
       restclient
       smartparens
       swift-mode
-      (trivialBuild {
-        pname = "swift-ts-mode";
-        version = "main-07-05-2024";
-        src = pkgs.fetchFromGitHub {
-          owner = "rechsteiner";
-          repo = "swift-ts-mode";
-          rev = "5e198d306bd4d49e4dddab39195fe99e1caf8892";
-          hash = "sha256-c7AAFuaDbufMpzJtJ2PbRRXFJmo1y4L50T0idzxrvao=";
-        };
-      })
       super-save
       treesit-auto
       ob-typescript