oni-sh: Include ‘bash-ts-mode’ for everything needed for ‘sh-mode’

1 files changed, 10 insertions, 7 deletions

diff --git a/oni-sh.el b/oni-sh.el
index 3d2623f..aac6d81 100644
--- a/oni-sh.el
+++ b/oni-sh.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2025.0624.144537
+;; Version: 2025.1006.105522
 ;; Package-Requires: (reformatter oni-flycheck oni-smartparens)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -47,16 +47,19 @@
   :lighter ""
   :group 'shfmt)
 
-(add-hook 'sh-mode-hook 'display-fill-column-indicator-mode)
-(add-hook 'sh-mode-hook 'electric-indent-local-mode)
-(add-hook 'sh-mode-hook 'flycheck-mode)
-(add-hook 'sh-mode-hook 'shfmt-on-save-mode)
-(add-hook 'sh-mode-hook 'smartparens-mode)
+(mapc (lambda (minor-mode)
+        (add-hook 'sh-mode-hook minor-mode)
+        (add-hook 'bash-ts-mode-hook minor-mode))
+      '(display-fill-column-indicator-mode
+        electric-indent-local-mode
+        flycheck-mode
+        shfmt-on-save-mode
+        smartparens-mode))
 
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("PKGBUILD\\'" . sh-mode))
 ;;;###autoload
-(add-to-list 'auto-mode-alist `(,(rx "/.env" (optional (or ".dev" ".development" ".testing" ".production" ".example")) eos) . sh-mode))
+(add-to-list 'auto-mode-alist (cons (rx "/.env" (optional (or ".dev" ".development" ".testing" ".production" ".example")) eos) 'sh-mode))
 
 (provide 'oni-sh)
 ;;; oni-sh.el ends here