all repos — nixfiles @ ed3b8982fdc50c2e79532a203f749a8f96e538f8

System and user configuration, managed by nix and home-manager

emacs: fix auto-formatting setup for go templates
Alan Pearce alan@alanpearce.eu
Sat, 11 May 2024 15:05:16 +0200
commit

ed3b8982fdc50c2e79532a203f749a8f96e538f8

parent

10563d73b1c4f87e78fd2a93dd0bfb9787701d99

1 files changed, 6 insertions(+), 5 deletions(-)

jump to
M user/emacs/init.el → user/emacs/init.el
@@ -1113,13 +1113,14 @@ (setq apheleia-formatters                   (append apheleia-formatters '((nixpkgs-fmt "nixpkgs-fmt")
                                                 (golines "golines")
                                                 (prettier-gotmpl
-                                                 ("prettier" "--stdin-filepath" filepath
-                                                  "--parser=go-template" (apheleia-formatters-js-indent "--use-tabs" "--tab-width"))))))
+                                                 "prettier" "--stdin-filepath" filepath
+                                                 "--parser=go-template" (apheleia-formatters-indent "--use-tabs" "--tab-width")))))
             (setf (alist-get 'go-ts-mode apheleia-mode-alist)
-                  '(golines))
+                  '(golines)
+                  (alist-get 'web-mode apheleia-mode-alist)
+                  '(prettier-gotmpl))
             (setq apheleia-mode-alist (append apheleia-mode-alist '((nix-ts-mode . nixpkgs-fmt)
-                                                                    (nix-mode . nixpkgs-fmt)
-                                                                    (go-ts-mode . prettier-gotmpl))))
+                                                                    (nix-mode . nixpkgs-fmt))))
             (add-hook 'apheleia-mode-hook #'turn-off-format-all-mode))
   :init (progn
           (apheleia-global-mode +1)))