fix(format): consolidate save-without-formatting keybind

It's too much hassle to claim either 'SPC b s' or 'SPC f s' for the
saving-without-formatting command (and to justify why one over the
other), so porque no los dos? Plus, I now leave 'C-x C-s' (save-buffer)
alone; principle of least surprise and what not.

Fix: #8460
Ref: https://xkcd.com/1172

modules/config/default/+evil-bindings.el

@@ -417,7 +417,7 @@
        :desc "Previous buffer"             "p"   #'previous-buffer
        :desc "Revert buffer"               "r"   #'revert-buffer
        :desc "Rename buffer"               "R"   #'rename-buffer
-       :desc "Save buffer"                 "s"   #'save-buffer
+       :desc "Save buffer"                 "s"   #'basic-save-buffer
        :desc "Save all buffers"            "S"   #'evil-write-all
        :desc "Save buffer as root"         "u"   #'doom/sudo-save-buffer
        :desc "Pop up scratch buffer"       "x"   #'doom/open-scratch-buffer

modules/editor/format/config.el

@@ -47,8 +47,7 @@ This is controlled by `+format-on-save-disabled-modes'."
 
   ;; UX: Use prefix-arg on `save-buffer' or `basic-save-buffer' to inhibit
   ;;   format-on-save behavior.
-  (define-key apheleia-mode-map [remap basic-save-buffer] #'+format/save-buffer-no-reformat)
-  (define-key apheleia-mode-map [remap save-buffer] #'+format/save-buffer)
+  (define-key apheleia-mode-map [remap basic-save-buffer] #'+format/save-buffer)
 
   ;; HACK: Apheleia suppresses notifications that the current buffer has
   ;;   changed, so plugins that listen for them need to be manually informed: