4 files changed, 13 insertions, 8 deletions

diff --git a/emacs/.config/emacs/arkta/arkta-progmodes.el b/emacs/.config/emacs/arkta/arkta-progmodes.el
index 78da860..9da935e 100644
--- a/emacs/.config/emacs/arkta/arkta-progmodes.el
+++ b/emacs/.config/emacs/arkta/arkta-progmodes.el
@@ -86,13 +86,10 @@
   :straight '(elisp-mode :type built-in)
   :mode ("\\.el\\'" . emacs-lisp-mode))
 
-(use-package elixir-mode
-  :straight t
-  :mode "\\.exs?\\'"
-  :init
-  (defun arkta/elixir-setup ()
-    (add-hook 'before-save-hook #'elixir-format nil t))
-  :hook (elixir-mode . arkta/elixir-setup))
+(use-package elixir-ts-mode
+  ;; TODO: Format code on saving
+  :straight '(elixir-ts-mode :type built-in)
+  :mode "\\.exs?\\'")
 
 (use-package gdscript-mode
   :straight t
diff --git a/emacs/.config/emacs/arkta/arkta-treesit.el b/emacs/.config/emacs/arkta/arkta-treesit.el
index cfe063b..60952d6 100644
--- a/emacs/.config/emacs/arkta/arkta-treesit.el
+++ b/emacs/.config/emacs/arkta/arkta-treesit.el
@@ -115,6 +115,10 @@
                       ,(arkta/treesit-cond
                          (14 "v0.2.0")))
 
+          (elixir "https://github.com/elixir-lang/tree-sitter-elixir"
+                  ,(arkta/treesit-cond
+                     (14 "v0.3.4")))
+
           (go "https://github.com/tree-sitter/tree-sitter-go.git"
               ,(arkta/treesit-cond
                  (15 "v0.25.0")
@@ -124,6 +128,10 @@
                  ,(arkta/treesit-cond
                     (14 "v1.1.0")))
 
+          (heex "https://github.com/phoenixframework/tree-sitter-heex"
+                ,(arkta/treesit-cond
+                   (14 "v0.8.0")))
+
           (java "https://github.com/tree-sitter/tree-sitter-java.git"
                 ,(arkta/treesit-cond
                    (14 "v0.23.5")))
diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el
index 18a095a..bbde1e1 100644
--- a/emacs/.config/emacs/init.el
+++ b/emacs/.config/emacs/init.el
@@ -59,6 +59,7 @@
                             (csharp-mode . csharp-ts-mode)
                             (css-mode . css-ts-mode)
                             (dockerfile-mode . dockerfile-ts-mode)
+                            (elixir-mode . elixir-ts-mode)
                             (go-mode . go-ts-mode)
                             (go-mod-mode . go-mod-ts-mode)
                             (html-mode . mhtml-mode)
diff --git a/emacs/.config/emacs/straight/versions/default.el b/emacs/.config/emacs/straight/versions/default.el
index 6f01f13..8c56d0d 100644
--- a/emacs/.config/emacs/straight/versions/default.el
+++ b/emacs/.config/emacs/straight/versions/default.el
@@ -19,7 +19,6 @@
  ("elisp-refs" . "541a064c3ce27867872cf708354a65d83baf2a6d")
  ("elpher" . "dcdeb86f7ae633e252f9ef8a73d3458e87c1ab12")
  ("emacs-dashboard" . "e5fc08e78223487aa0da12539be1a23356c09ec7")
- ("emacs-elixir" . "00d6580a040a750e019218f9392cf9a4c2dac23a")
  ("emacs-emojify" . "1b726412f19896abf5e4857d4c32220e33400b55")
  ("emacs-gdscript-mode" . "bd0a741066a7bb2dfa51d2daec54fc38d56078a5")
  ("emacs-kotlin-ts-mode" . "051c9ef534956c235343fb41546623ff87a1695b")