Merge branch 'redbook'

home.org

@@ -851,8 +851,6 @@ Turn off some default settings that I don't find useful.
 
 #+BEGIN_SRC elisp
   (setopt save-interprogram-paste-before-kill t)
-  (setopt kill-whole-line t)
-  (column-number-mode t)
   (setopt enable-recursive-minibuffers t)
   (setopt line-spacing 0.15)
 
@@ -907,6 +905,22 @@ least this setting is correct.
   (setopt sentence-end-double-space nil)
 #+end_src
 
+I kill whole lines *way* more than partial lines. If the cursor is at the front of a line, this will
+just kill the whole line instead of requiring two ~C-k C-k~ presses to make it happen. I'm not sure
+when I'd ever want it to kill the line *without* the trailing newline, but I guess the one time ever
+that I do, I'll have to press two more keys :(
+
+#+begin_src elisp
+  (setopt kill-whole-line t)
+#+end_src
+
+Show column numbers in the modeline. Now that I think about it, I'm not sure why I want this. I
+guess I could try turning it off someday?
+
+#+begin_src elisp
+  (column-number-mode t)
+#+end_src
+
 Make sure which-key mode is always on. The on-the-fly keymap help it gives is indespensable.
 
 #+BEGIN_SRC elisp
@@ -1255,18 +1269,12 @@ content to be.
   (setopt split-width-threshold 200)
   (setopt split-height-threshold nil)
   (setopt display-buffer-base-action
-   '((display-buffer-reuse-window display-buffer-same-window
+          '((display-buffer-reuse-window
-      display-buffer-in-previous-window
+             display-buffer-reuse-mode-window
              display-buffer-use-some-window)))
 
   (setq display-buffer-alist
-            '(((or "magit: *"
+        '(((or "\\*Flymake diagnostics .*"
-                   "magit-log*"
-                   "\\*Messages\\*"
-                   "\\*trace-output\\*"
-                   "\\*EGLOT connections\\*")
-               (jf/display-buffer-fullscreen))
-              ((or "\\*Flymake diagnostics .*"
                "\\*Embark Export: .*"
                "\\*Embark Collect .*"
                "\\*xref\\*"
@@ -1280,10 +1288,13 @@ content to be.
            (display-buffer-in-side-window)
            (side . bottom)
            (slot . 0)
-               (window-height . 0.33)
+           (window-height . 0.33))
-               (window-parameters (no-delete-other-windows . t)
+          ((or "magit: *"
-                                  (no-other-window . t)))
+               "magit-log*"
-              ((or "magit-revision: .*"
+               "\\*Messages\\*"
+               "\\*trace-output\\*"
+               "\\*EGLOT connections\\*"
+               "magit-revision: .*"
                "\\*Help\\*"
                "\\*rustfmt\\*"
                "\\*slack: .*"
@@ -1294,7 +1305,9 @@ content to be.
                "\\*List .*"
                "\\*Embark Actions\\*"
                "\\*eldoc\\*")
-               (jf/display-buffer-right))))
+           (display-buffer-reuse-window
+            display-buffer-reuse-mode-window
+            jf/display-buffer-right))))
 
   (setopt window-persistent-parameters
           (cl-list* '(no-delete-other-windows . writable)
@@ -1315,10 +1328,10 @@ This configuration affects general text editing, across all modes. First, some p
     programs.emacs = {
       enable = true;
       extraPackages = epkgs: with epkgs; [
+        apheleia
         avy
         edit-indirect
         embark
-        format-all
         god-mode
         # evil
         # evil-collection
@@ -1432,6 +1445,12 @@ Just "silently" wrap when searching at the bottom of a document.
   (bind-keys ("C-x 4 n" . edit-indirect-region))
 #+END_SRC
 
+Some auto-formatting stuff
+
+#+begin_src elisp
+  (push '(prisma-format "prisma" "format" "--schema" filepath) apheleia-formatters)
+#+end_src
+
 ** Workflow
 :PROPERTIES:
 :header-args:elisp: :tangle target/desktop/emacs-workflow.el