emacs: replace lua-mode with lua-ts-mode

3 files changed, 14 insertions, 7 deletions

diff --git a/emacs/.config/emacs/arkta/arkta-progmodes.el b/emacs/.config/emacs/arkta/arkta-progmodes.el
index c58ee93..8fa7624 100644
--- a/emacs/.config/emacs/arkta/arkta-progmodes.el
+++ b/emacs/.config/emacs/arkta/arkta-progmodes.el
@@ -147,11 +147,11 @@
   :straight '(lisp-mode :type built-in)
   :mode "\\.lisp\\'")
 
-(use-package lua-mode
-  :straight t
-  :custom
-  (lua-indent-level standard-indent)
-  :mode ("\\.lua\\'" "\\.rockspec\\'"))
+(use-package lua-ts-mode
+  :straight '(lua-ts-mode :type built-in)
+  :after treesit
+  :mode ("\\.lua\\'" "\\.rockspec\\'")
+  :custom (lua-ts-indent-offset standard-offset))
 
 (use-package make-mode
   :straight '(make-mode :type built-in)
@@ -207,8 +207,8 @@
   :mode "\\.php\\'")
 
 (use-package pico8-mode
-  :straight '(pico8-mode :host github
-                         :repo "Kaali/pico8-mode")
+  ;; NOTE: This uses lua-mode instead of lua-ts-mode under the hood
+  :straight '(pico8-mode :host github :repo "Kaali/pico8-mode")
   :mode "\\.p8\\'")
 
 (use-package proof-general
diff --git a/emacs/.config/emacs/arkta/arkta-treesit.el b/emacs/.config/emacs/arkta/arkta-treesit.el
index 6f867df..2a33d8f 100644
--- a/emacs/.config/emacs/arkta/arkta-treesit.el
+++ b/emacs/.config/emacs/arkta/arkta-treesit.el
@@ -153,6 +153,12 @@
                      (14 "0.3.8")
                      (13 "0.2.11")))
 
+          (lua "https://github.com/tree-sitter-grammars/tree-sitter-lua"
+               ,(arkta/treesit-cond
+                  (15 "v0.4.0")
+                  (14 "v0.3.0")
+                  (13 "v0.0.15")))
+
           (python "https://github.com/tree-sitter/tree-sitter-python.git"
                   ,(arkta/treesit-cond
                      (15 "v0.25.0")
diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el
index cb865ac..18a095a 100644
--- a/emacs/.config/emacs/init.el
+++ b/emacs/.config/emacs/init.el
@@ -65,6 +65,7 @@
                             (java-mode . java-ts-mode)
                             (js-mode . js-ts-mode)
                             (json-mode . json-ts-mode)
+                            (lua-mode . lua-ts-mode)
                             (python-mode . python-ts-mode)
                             (ruby-mode . ruby-ts-mode)
                             (rust-mode . rust-ts-mode)