diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix
index b6d8ebd..1e832fb 100644
--- a/modules/emacs/default.nix
+++ b/modules/emacs/default.nix
@@ -31,6 +31,7 @@
     tree-sitter-dot
     tree-sitter-elisp
     tree-sitter-glsl
+    tree-sitter-haskell
     tree-sitter-html
     tree-sitter-java
     tree-sitter-javascript
@@ -58,6 +59,7 @@
     tree-sitter-astro
     tree-sitter-vim
     tree-sitter-yaml
+    tree-sitter-zig
   ];
 
   custom-emacs =
@@ -79,11 +81,13 @@
       fussy
       glsl-mode
       groovy-mode
+      haskell-ts-mode
       just-mode
       kotlin-mode
       lsp-mode
       lsp-treemacs
       lsp-ui
+      lsp-haskell
       lsp-java
       magit
       markdown-mode
@@ -104,6 +108,7 @@
       vertico
       which-key
       ws-butler
+      zig-ts-mode
     ]));
 in {
   home-manager.users.${config.main-user} = {
diff --git a/modules/user/dev-support.nix b/modules/user/dev-support.nix
index c93011f..2c57f34 100644
--- a/modules/user/dev-support.nix
+++ b/modules/user/dev-support.nix
@@ -6,7 +6,9 @@
     kotlin-language-server
     typescript-language-server
     astro-language-server
+    haskell-language-server
     glslls
+    zls
 
     bear
     gdb