emacs: Replace haskell-mode with haskell-ts-mode

4 files changed, 11 insertions, 3 deletions

diff --git a/emacs/.config/emacs/arkta/arkta-progmodes.el b/emacs/.config/emacs/arkta/arkta-progmodes.el
index ab19ab1..d6bdbe2 100644
--- a/emacs/.config/emacs/arkta/arkta-progmodes.el
+++ b/emacs/.config/emacs/arkta/arkta-progmodes.el
@@ -113,9 +113,12 @@
          "\\.gradle\\'"
          "\\.groovy\\'"))
 
-(use-package haskell-mode
+(use-package haskell-ts-mode
   :straight t
-  :mode "\\.hs\\'")
+  :mode "\\.hs\\'"
+  :custom
+  (haskell-ts-font-lock-level 4)
+  (haskell-ts-use-indent t))
 
 (use-package htmlize
   :straight t)
diff --git a/emacs/.config/emacs/arkta/arkta-treesit.el b/emacs/.config/emacs/arkta/arkta-treesit.el
index c3f7654..7a7e200 100644
--- a/emacs/.config/emacs/arkta/arkta-treesit.el
+++ b/emacs/.config/emacs/arkta/arkta-treesit.el
@@ -133,6 +133,10 @@
                  ,(arkta/treesit-cond
                     (14 "v1.1.0")))
 
+          (haskell "https://github.com/tree-sitter/tree-sitter-haskell"
+                   ,(arkta/treesit-cond
+                      (14 "v0.23.1")))
+
           (heex "https://github.com/phoenixframework/tree-sitter-heex"
                 ,(arkta/treesit-cond
                    (14 "v0.8.0")))
diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el
index 56e1adf..a478918 100644
--- a/emacs/.config/emacs/init.el
+++ b/emacs/.config/emacs/init.el
@@ -63,6 +63,7 @@
                             (gdscript-mode . gdscript-ts-mode)
                             (go-mode . go-ts-mode)
                             (go-mod-mode . go-mod-ts-mode)
+                            (haskell-mode . haskell-ts-mode)
                             (html-mode . mhtml-mode)
                             (java-mode . java-ts-mode)
                             (js-mode . js-ts-mode)
diff --git a/emacs/.config/emacs/straight/versions/default.el b/emacs/.config/emacs/straight/versions/default.el
index 8c56d0d..60d2577 100644
--- a/emacs/.config/emacs/straight/versions/default.el
+++ b/emacs/.config/emacs/straight/versions/default.el
@@ -34,7 +34,7 @@
  ("git-gutter" . "5429931c91469c8dbf82f97e81414bdf25e838a4")
  ("gnu-elpa-mirror" . "e15f2d8da53d44f3b6a7b39cdb49f6e01e7e2b87")
  ("groovy-emacs-modes" . "7b8520b2e2d3ab1d62b35c426e17ac25ed0120bb")
- ("haskell-mode" . "bd89438b0e6e6b6877d635699e265da85e85ca06")
+ ("haskell-ts-mode" . "16155f8b63ccf67d46535207a4f4378f675a8b47")
  ("helpful" . "03756fa6ad4dcca5e0920622b1ee3f70abfc4e39")
  ("hl-todo" . "2e9504511aa393686f44a36716c1d2ebdc5def1f")
  ("ht.el" . "1c49aad1c820c86f7ee35bf9fff8429502f60fef")