diff --git a/Cask b/Cask
index 5567af546..46bd2dc8c 100644
--- a/Cask
+++ b/Cask
@@ -186,6 +186,8 @@
 
 ;; Lua -- modules/module-lua.el
 (depends-on "lua-mode")
+(depends-on "company-lua")
+(depends-on "moonscript" :git "https://github.com/k2052/moonscript-mode")
 
 ;; PHP -- modules/module-php.el
 (depends-on "php-mode")
diff --git a/modules/module-lua.el b/modules/module-lua.el
index 5b2a9e081..4f1cf66d9 100644
--- a/modules/module-lua.el
+++ b/modules/module-lua.el
@@ -5,7 +5,7 @@
   :interpreter "lua"
   :init (add-hook 'lua-mode-hook 'flycheck-mode)
   :config
-  (def-company-backend! lua-mode (yasnippet))
+  (def-company-backend! lua-mode (lua yasnippet))
   (def-electric! lua-mode :words ("else" "end"))
   (def-repl! lua-mode narf/inf-lua)
   (sp-with-modes '(lua-mode)
@@ -24,6 +24,13 @@
     ;; inline functions
     (sp-local-pair "function " " end" :unless '(sp-point-after-bol-p))))
 
+(use-package company-lua :after lua-mode)
+
+(use-package moonscript
+  :mode ("\\.moon$" . moonscript-mode)
+  :config
+  (push '(moonscript-mode moonscript-indent-offset) editorconfig-indentation-alist))
+
 ;;
 (def-project-type! love "♥"
   :modes (lua-mode markdown-mode json-mode)