emacs: remove format-all
2 files changed, 2 insertions(+), 19 deletions(-)
changed files
M user/emacs/init.el → user/emacs/init.el
@@ -1256,9 +1256,7 @@ (if eglot-format-before-save-mode (progn (add-hook 'before-save-hook #'eglot-format-buffer nil 'local) (when (bound-and-true-p apheleia-mode) - (apheleia-mode -1)) - (when (bound-and-true-p format-all-mode) - (format-all-mode -1))) + (apheleia-mode -1))) (remove-hook 'before-save-hook #'eglot-format-buffer 'local))) (use-package eglot@@ -1376,19 +1374,6 @@ #'eglot-code-actions))) ;;;; Reformat on save -(use-package format-all - :defer 10 - :ghook ('prog-mode-hook) - :gfhook #'format-all-ensure-formatter - :init (progn - (advice-add 'format-all-ensure-formatter - :around #'quiet) - (defun turn-off-format-all-mode () - (when (bound-and-true-p format-all-mode) - (format-all-mode -1)))) - :config (progn - (setq format-all-show-errors nil))) - (use-package apheleia :defer 11 ; load after format-all for hook ordering? :ghook 'prog-mode-hook@@ -1402,8 +1387,7 @@ (sqlfluff "sqlfluff" "format" "--stdin-filename" filepath "-") (prettier-gotmpl "prettier" "--stdin-filepath" filepath "--parser=go-template" (apheleia-formatters-indent "--use-tabs" "--tab-width"))))) - (setq apheleia-mode-alist (append apheleia-mode-alist '((toml-ts-mode . taplo)))) - (add-hook 'apheleia-mode-hook #'turn-off-format-all-mode)) + (setq apheleia-mode-alist (append apheleia-mode-alist '((toml-ts-mode . taplo))))) :init (progn (apheleia-global-mode +1)))
M user/settings/emacs.nix → user/settings/emacs.nix
@@ -115,7 +115,6 @@ expand-region eyebrowse fish-mode feature-mode - format-all flycheck flymake-popon general