diff options
Diffstat (limited to 'init.el')
-rw-r--r-- | init.el | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/init.el b/init.el index c3cbb68..e294a95 100644 --- a/init.el +++ b/init.el | |||
@@ -964,30 +964,26 @@ specific to most general, they are these: | |||
964 | (setup (:straight (apheleia | 964 | (setup (:straight (apheleia |
965 | :host github | 965 | :host github |
966 | :repo "raxod502/apheleia")) | 966 | :repo "raxod502/apheleia")) |
967 | 967 | ||
968 | (apheleia-global-mode +1) | 968 | (:also-load acdw-apheleia) |
969 | 969 | (add-hook 'before-save-hook #'apheleia-dumb-auto-format) | |
970 | ;; Use a dumb formatter on modes that `apheleia' doesn't work for. | 970 | |
971 | (add-hook 'before-save-hook | 971 | ;; Aphelia can't find prettier on Windows (though I |
972 | (defun before-save@dumb-auto-format () | 972 | ;; installed it, I think), and it keeps trying to start |
973 | (setq stupid-modes '(makefile-mode | 973 | ;; new processes until Emacs runs out of subprocess space. |
974 | org-mode)) | 974 | ;; So I just enable it at home. |
975 | ;; If there's no apheleia formatter for the mode, just indent the | 975 | (unless (acdw/system :work) |
976 | ;; buffer. | 976 | (apheleia-global-mode +1))) |
977 | (unless (or (apply #'derived-mode-p stupid-modes) | ||
978 | (and (fboundp 'apheleia--get-formatter-command) | ||
979 | (apheleia--get-formatter-command))) | ||
980 | (indent-region (point-min) (point-max)))))) | ||
981 | 977 | ||
982 | (setup (:straight async) | 978 | (setup (:straight async) |
983 | (dired-async-mode +1)) | 979 | (dired-async-mode +1)) |
984 | 980 | ||
985 | (setup (:straight avy) | 981 | (setup (:straight avy) |
986 | (:global "C-'" #'avy-goto-char-timer | 982 | (:global "M-j" #'avy-goto-char-timer |
987 | "C-c C-j" #'avy-resume) | 983 | "C-c C-j" #'avy-resume) |
988 | 984 | ||
989 | (:with-feature isearch | 985 | (:with-feature isearch |
990 | (:bind "C-'" #'avy-isearch))) | 986 | (:bind "M-j" #'avy-isearch))) |
991 | 987 | ||
992 | (setup (:straight circe) | 988 | (setup (:straight circe) |
993 | (require 'circe) | 989 | (require 'circe) |