diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el index 4636076f4..ff6559b8e 100644 --- a/modules/lang/javascript/config.el +++ b/modules/lang/javascript/config.el @@ -121,8 +121,12 @@ web-mode markdown-mode js-mode ; includes js2-mode and rjsx-mode + js-ts-mode json-mode + json-ts-mode typescript-mode + typescript-ts-mode + tsx-ts-mode solidity-mode) :when (locate-dominating-file default-directory "package.json") :add-hooks '(+javascript-add-npm-path-h)) diff --git a/modules/lang/lua/config.el b/modules/lang/lua/config.el index 0314fafeb..8e6253929 100644 --- a/modules/lang/lua/config.el +++ b/modules/lang/lua/config.el @@ -72,7 +72,7 @@ ;;; Frameworks (def-project-mode! +lua-love-mode - :modes '(moonscript-mode lua-mode lua-ts-mode markdown-mode json-mode) + :modes '(moonscript-mode lua-mode lua-ts-mode markdown-mode json-mode json-ts-mode) :when (+lua-love-project-root) :on-load (progn diff --git a/modules/lang/php/config.el b/modules/lang/php/config.el index 85382b068..e15d72f8f 100644 --- a/modules/lang/php/config.el +++ b/modules/lang/php/config.el @@ -136,7 +136,7 @@ ;; Projects (def-project-mode! +php-laravel-mode - :modes '(php-mode php-ts-mode yaml-mode web-mode nxml-mode js2-mode scss-mode) + :modes '(php-mode php-ts-mode yaml-mode yaml-ts-mode web-mode nxml-mode js-mode js-ts-mode scss-mode) :files (and "artisan" "server.php")) (def-project-mode! +php-composer-mode diff --git a/modules/lang/web/config.el b/modules/lang/web/config.el index c9fcc4ef8..7ef81a2f5 100644 --- a/modules/lang/web/config.el +++ b/modules/lang/web/config.el @@ -22,7 +22,7 @@ ;;; Framework-based minor-modes (def-project-mode! +web-jekyll-mode - :modes '(web-mode js-mode coffee-mode css-mode haml-mode pug-mode) + :modes '(web-mode js-mode js-ts-mode coffee-mode css-mode css-ts-mode haml-mode pug-mode) :files (and (or "_config.yml" "_config.toml") (or "_layouts/" "_posts/")) :on-enter @@ -30,14 +30,14 @@ (web-mode-set-engine "django"))) (def-project-mode! +web-django-mode - :modes '(web-mode python-mode) + :modes '(web-mode python-mode python-ts-mode) :files ("manage.py") :on-enter (when (derived-mode-p 'web-mode) (web-mode-set-engine "django"))) (def-project-mode! +web-wordpress-mode - :modes '(php-mode web-mode css-mode haml-mode pug-mode) + :modes '(php-mode php-ts-mode web-mode css-mode css-ts-mode haml-mode pug-mode) :files (or "wp-config.php" "wp-config-sample.php")) (when (modulep! :lang javascript) diff --git a/modules/tools/ansible/config.el b/modules/tools/ansible/config.el index 405b12edf..c4723ba44 100644 --- a/modules/tools/ansible/config.el +++ b/modules/tools/ansible/config.el @@ -30,7 +30,7 @@ (def-project-mode! +ansible-yaml-mode - :modes '(yaml-mode) + :modes '(yaml-mode yaml-ts-mode) :add-hooks '(ansible-mode ansible-auto-decrypt-encrypt ansible-doc-mode) :files (or "roles/" "tasks/main.yml"