From b68db35f6216fbf34e6e578d48acba99a2f1f5d2 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Mon, 7 Aug 2023 22:27:36 -0600
Subject: [PATCH] [Emacs] Replace format-all with apheleia

---
 dotfiles/emacs.d/README.org | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org
index 90111373..24fe05da 100644
--- a/dotfiles/emacs.d/README.org
+++ b/dotfiles/emacs.d/README.org
@@ -1781,9 +1781,6 @@ bind-key and global-set-key forms.
     (setq zop-to-char-kill-keys '(?\C-k ?\C-w))
     (setq zop-to-char-quit-at-point-keys '(?\r))))
 #+END_SRC
-
-
-
 ** projectile
 #+BEGIN_SRC emacs-lisp
 (use-package projectile
@@ -1913,12 +1910,12 @@ Neotree is useless with frame mode for now, so I've disabled it.
   (progn
     (flimenu-global-mode)))
 #+END_SRC
-** swiper
-#+BEGIN_SRC emacs-lisp
-(use-package swiper
+** ctrlf
+#+begin_src emacs-lisp
+(use-package ctrlf
   :disabled t
-  :bind ("C-s" . swiper))
-#+END_SRC
+  :config (ctrlf-mode +1))
+#+end_src
 * Completion
 ** vertico
 #+begin_src emacs-lisp
@@ -2193,8 +2190,19 @@ I don't use auto-complete at all, so I have set up a hook to automatically disab
 ** format-all
 #+begin_src emacs-lisp
 (use-package format-all
+  :disabled t
   :commands (format-all-buffer format-all-mode))
 #+end_src
+** apheleia
+#+begin_src emacs-lisp
+(use-package apheleia
+  :init
+  (defvar imalison:apheleia-allowed nil)
+  :config
+  (progn
+    (setq-default apheleia-inhibit t)
+    (apheleia-global-mode +1)))
+#+end_src
 ** cliphist
 #+BEGIN_SRC emacs-lisp
 (use-package cliphist
@@ -2308,9 +2316,7 @@ I don't use auto-complete at all, so I have set up a hook to automatically disab
     (add-hook 'hack-local-variables-hook
               (lambda ()
                 (when imalison:use-black
-                  (setq format-all-formatters nil)
-                  (add-to-list 'format-all-formatters '("Python" . (black)))
-                  (format-all-mode))
+                  (setq imalison:apheleia-allowed t))
                 (when imalison:use-lsp-python
                   (lsp-deferred))) nil t))
   :config
@@ -3028,11 +3034,9 @@ The following is taken from [[https://github.com/syl20bnr/spacemacs/blob/a650877
     ;; XXX: These should probably be moved to config, right?
     (setq org-startup-indented nil
           org-startup-folded t
+          org-fold-catch-invisible-edits 'show
           org-edit-src-content-indentation 0
-          org-src-preserve-indentation t
-          org-directory "~/Dropbox/org"
-          org-mobile-inbox-for-pull "~/Dropbox/org/flagged.org"
-          org-mobile-directory "~/Dropbox/Apps/MobileOrg")
+          org-src-preserve-indentation t)
 
     (setq org-goto-interface 'outline-path-completion
           org-goto-max-level 10