emacs: Use tree-sitter for bash

TLATER · Jul 28, 2024 · 266e74c · 266e74c
1 parent 15e24c7
commit 266e74c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/home-config/dotfiles/emacs.d/config/editing.el b/home-config/dotfiles/emacs.d/config/editing.el
@@ -56,7 +56,8 @@
 
 (leaf files
   :ensure nil
-  :custom (require-final-newline . "visit-save"))
+  :custom (require-final-newline . "visit-save")
+  :custom (major-mode-remap-alist . '((sh-mode . bash-ts-mode))))
 
 ;; ----------------------------------------------------------------------------------
 ;;; Snippets

diff --git a/home-config/dotfiles/emacs.d/config/programming-languages.el b/home-config/dotfiles/emacs.d/config/programming-languages.el
@@ -232,8 +232,8 @@
 
 (leaf flymake-shellcheck
   :commands flymake-shellcheck-load
-  :hook (sh-mode-hook . flymake-shellcheck-load)
-  :hook (sh-mode-hook . (lambda () (setq-local devdocs-current-docs '("bash")))))
+  :hook ((sh-mode-hook bash-ts-mode-hook) . flymake-shellcheck-load)
+  :hook ((sh-mode-hook bash-ts-mode-hook) . (lambda () (setq-local devdocs-current-docs '("bash")))))
 
 ;; ----------------------------------------------------------------------------------
 ;;; Systemd
@@ -307,7 +307,7 @@
 (leaf eglot
   :commands (eglot eglot-format eglot-managed-p)
   :hook (((kotlin-mode-hook web-mode-hook rust-mode-hook python-mode-hook
-           sh-mode-hook c-mode-hook c++-mode-hook nix-mode-hook json-mode-hook) .
+           sh-mode-hook bash-ts-mode-hook c-mode-hook c++-mode-hook nix-mode-hook json-mode-hook) .
            eglot-ensure)
          (eglot-managed-mode-hook . set-eldoc-compose))
   :bind (:eglot-mode-map

diff --git a/pkgs/applications/emacs/default.nix b/pkgs/applications/emacs/default.nix
@@ -28,6 +28,7 @@ let
   custom-emacs = emacsPkgs.emacs.pkgs.withPackages (
     epkgs: (map (package: builtins.getAttr package epkgs) required-packages) ++ [
       (epkgs.treesit-grammars.with-grammars (grammars: with grammars; [
+        tree-sitter-bash
         tree-sitter-typescript
         tree-sitter-tsx
       ]))