diff --git a/lisp/init-eglot.el b/lisp/init-eglot.el
index 8640103..f086439 100644
--- a/lisp/init-eglot.el
+++ b/lisp/init-eglot.el
@@ -47,6 +47,9 @@
   (setq eglot-confirm-server-initiated-edits nil)
   (setq eglot-autoshutdown t)
   (add-to-list 'eglot-ignored-server-capabilities :inlayHintProvider)
+  (add-to-list 'eglot-server-programs
+               `((lua-mode lua-ts-mode)
+                 . ,(eglot-alternatives '("emmylua_ls" "lua-language-server" "lua-lsp"))))
   (add-to-list 'eglot-server-programs
                `((cmake-mode cmake-ts-mode)
                  . ,(eglot-alternatives '(("neocmakelsp" "stdio") "cmake-language-server"))))
@@ -78,6 +81,8 @@
                 python-ts-mode-hook
                 cmake-mode-hook
                 cmake-ts-mode-hook
+                lua-mode-hook
+                lua-ts-mode-hook
                 c-mode-hook
                 c++-mode-hook
                 c-ts-base-mode-hook))
diff --git a/lisp/init-treesit.el b/lisp/init-treesit.el
index d6b20cf..b886440 100644
--- a/lisp/init-treesit.el
+++ b/lisp/init-treesit.el
@@ -13,6 +13,9 @@
     (add-to-list 'major-mode-remap-alist '(js-mode . js-ts-mode))
     (add-to-list 'major-mode-remap-alist '(javascript-mode . js-ts-mode)))
 
+  (when (treesit-ready-p 'lua)
+    (add-to-list 'major-mode-remap-alist '(lua-mode . lua-ts-mode)))
+
   (when (treesit-ready-p 'json)
     (add-to-list 'major-mode-remap-alist '(js-json-mode . json-ts-mode)))