1 files changed, 82 insertions, 82 deletions

@@ -196,8 +196,8 @@
            dired-listing-switches "-Al"
            ls-lisp-dirs-first t
            dired-ls-F-marks-symlinks t
-           dired-no-confirm '(byte-compile load
-                              chgrp chmod chown
+           dired-no-confirm '(byte-compile
+                              load chgrp chmod chown
                               copy move hardlink symlink
                               shell touch)
            dired-dwim-target t)
@@ -347,19 +347,19 @@
 
 (setup org
   ;; Plain org with the `setup' form for sorting, but I install with straight.
-    (:straight (org
-                   :type git :host nil
-                   :repo "https://git.savannah.gnu.org/git/emacs/org-mode.git"
-                   :local-repo "org"
-                   :depth full
-                   :pre-build (straight-recipes-org-elpa--build)
-                   :build (:not autoloads)
-                   :files (:defaults
-                           "lisp/*.el"
-                           ("etc/styles/" "etc/styles/*")))
-                  (org-contrib
-                   :type git :host nil
-                   :repo "https://git.sr.ht/~bzg/org-contrib"))
+  (:straight (org
+              :type git :host nil
+              :repo "https://git.savannah.gnu.org/git/emacs/org-mode.git"
+              :local-repo "org"
+              :depth full
+              :pre-build (straight-recipes-org-elpa--build)
+              :build (:not autoloads)
+              :files (:defaults
+                      "lisp/*.el"
+                      ("etc/styles/" "etc/styles/*")))
+             (org-contrib
+              :type git :host nil
+              :repo "https://git.sr.ht/~bzg/org-contrib"))
   ;; DO NOT load system-installed org !!!
   (setq load-path (cl-remove-if (lambda (path)
                                   (string-match-p "lisp/org\\'" path))
@@ -494,7 +494,7 @@
              cape-abbrev
              cape-ispell
              ;;cape-dict))
-    (add-to-list 'completion-at-point-functions fn :append)))))
+             (add-to-list 'completion-at-point-functions fn :append)))))
 
 (setup (:straight (capf-autosuggest
                    :host nil
@@ -596,67 +596,67 @@
   (:also-load +consult)
   ;; from Consult wiki
   (:option register-preview-delay 0
-       register-preview-function 'consult-register-format
-       xref-show-xrefs-function 'consult-xref
-       xref-show-definitions-function 'consult-xref
-       tab-always-indent 'complete
-       completion-in-region-function 'consult-completion-in-region)
+           register-preview-function 'consult-register-format
+           xref-show-xrefs-function 'consult-xref
+           xref-show-definitions-function 'consult-xref
+           tab-always-indent 'complete
+           completion-in-region-function 'consult-completion-in-region)
   (advice-add #'register-preview :override #'consult-register-window)
   (advice-add #'completing-read-multiple :override
-          #'consult-completing-read-multiple)
+              #'consult-completing-read-multiple)
   (dolist (binding '(;; C-c bindings (mode-specific-map)
-             ("C-c h" . consult-history)
-             ("C-c m" . consult-mode-command)
-             ("C-c b" . consult-bookmark)
-             ("C-c k" . consult-kmacro)
-             ;; C-x bindings (ctl-x-map)
-             ("C-x M-:" . consult-complex-command)
-             ("C-x b" . consult-buffer)
-             ("C-x 4 b" . consult-buffer-other-window)
-             ("C-x 5 b" . consult-buffer-other-frame)
-             ;; Custom M-# bindings for fast register access
-             ("M-#" . consult-register-load)
-             ("M-'" . consult-register-store)
-             ("C-M-#" . consult-register)
-             ;; Other custom bindings
-             ("M-y" . consult-yank-pop)
-             ("<f1> a" . consult-apropos)
-             ;; M-g bindings (goto-map)
-             ("M-g e" . consult-compile-error)
-             ("M-g f" . consult-flymake) ; or consult-flycheck
-             ("M-g g" . consult-goto-line)
-             ("M-g M-g" . consult-goto-line)
-             ("M-g o" . consult-outline) ; or consult-org-heading
-             ("M-g m" . consult-mark)
-             ("M-g k" . consult-global-mark)
-             ("M-g i" . consult-imenu)
-             ("M-g I" . consult-imenu-multi)
-             ;; M-s bindings (search-map)
-             ("M-s f" . consult-find)
-             ("M-s F" . consult-locate)
-             ("M-s g" . consult-grep)
-             ("M-s G" . consult-git-grep)
-             ("M-s r" . consult-ripgrep)
-             ("M-s l" . consult-line)
-             ("M-s L" . consult-line-multi)
-             ("M-s m" . consult-multi-occur)
-             ("M-s k" . consult-keep-lines)
-             ("M-s u" . consult-focus-lines)
-             ;; Isearch integration
-             ("M-s e" . consult-isearch-history)))
+                     ("C-c h" . consult-history)
+                     ("C-c m" . consult-mode-command)
+                     ("C-c b" . consult-bookmark)
+                     ("C-c k" . consult-kmacro)
+                     ;; C-x bindings (ctl-x-map)
+                     ("C-x M-:" . consult-complex-command)
+                     ("C-x b" . consult-buffer)
+                     ("C-x 4 b" . consult-buffer-other-window)
+                     ("C-x 5 b" . consult-buffer-other-frame)
+                     ;; Custom M-# bindings for fast register access
+                     ("M-#" . consult-register-load)
+                     ("M-'" . consult-register-store)
+                     ("C-M-#" . consult-register)
+                     ;; Other custom bindings
+                     ("M-y" . consult-yank-pop)
+                     ("<f1> a" . consult-apropos)
+                     ;; M-g bindings (goto-map)
+                     ("M-g e" . consult-compile-error)
+                     ("M-g f" . consult-flymake) ; or consult-flycheck
+                     ("M-g g" . consult-goto-line)
+                     ("M-g M-g" . consult-goto-line)
+                     ("M-g o" . consult-outline) ; or consult-org-heading
+                     ("M-g m" . consult-mark)
+                     ("M-g k" . consult-global-mark)
+                     ("M-g i" . consult-imenu)
+                     ("M-g I" . consult-imenu-multi)
+                     ;; M-s bindings (search-map)
+                     ("M-s f" . consult-find)
+                     ("M-s F" . consult-locate)
+                     ("M-s g" . consult-grep)
+                     ("M-s G" . consult-git-grep)
+                     ("M-s r" . consult-ripgrep)
+                     ("M-s l" . consult-line)
+                     ("M-s L" . consult-line-multi)
+                     ("M-s m" . consult-multi-occur)
+                     ("M-s k" . consult-keep-lines)
+                     ("M-s u" . consult-focus-lines)
+                     ;; Isearch integration
+                     ("M-s e" . consult-isearch-history)))
     (define-key +key-mode-map (kbd (car binding)) (cdr binding)))
   (with-eval-after-load 'isearch-mode
     (dolist (binding '(("M-e" . consult-isearch-history)
-               ("M-s e" . consult-isearch-history)
-               ("M-s l" . consult-line)
-               ("M-s L" . consult-line-multi)))
+                       ("M-s e" . consult-isearch-history)
+                       ("M-s l" . consult-line)
+                       ("M-s L" . consult-line-multi)))
       (define-key isearch-mode-map (car binding) (cdr binding))))
   (with-eval-after-load 'org-mode
     (define-key org-mode-map "M-g o" 'consult-org-heading))
   (advice-add 'consult-yank-pop :after '+yank@indent)
   (with-eval-after-load 'consult
     (:option consult-narrow-key "<"
-         consult-project-root-function '+consult-project-root)
+             consult-project-root-function '+consult-project-root)
     (consult-customize
      consult-theme
      :preview-key '(:debounce 0.2 any)
@@ -837,7 +837,7 @@ See also `crux-reopen-as-root-mode'."
 
 (setup (:straight hungry-delete)
   (:option hungry-delete-chars-to-skip " \t"
-       hungry-delete-join-reluctantly nil)
+           hungry-delete-join-reluctantly nil)
   (:bind-into paredit
     ;; I define these functions here because they really require both packages
     ;; to make any sense.  So, would I put them in `+hungry-delete' or
@@ -846,14 +846,14 @@ See also `crux-reopen-as-root-mode'."
     (defun acdw/paredit-hungry-delete-backward (arg)
       (interactive "P")
       (if (looking-back "[ \t]" 1)
-      (hungry-delete-backward (or arg 1))
-    (paredit-backward-delete arg)))
+          (hungry-delete-backward (or arg 1))
+        (paredit-backward-delete arg)))
     [remap paredit-forward-delete]
     (defun acdw/paredit-hungry-delete-forward (arg)
       (interactive "P")
       (if (looking-at "[ \t]")
-      (hungry-delete-forward (or arg 1))
-    (paredit-forward-delete arg))))
+          (hungry-delete-forward (or arg 1))
+        (paredit-forward-delete arg))))
   (global-hungry-delete-mode +1))
 
 (setup (:straight isearch-mb)
@@ -862,19 +862,19 @@ See also `crux-reopen-as-root-mode'."
   ;; project's README.
   (with-eval-after-load 'isearch-mb
     (dolist (spec '((isearch-mb--with-buffer
-             ("M-e" .  consult-isearch)
-             ("C-o" . loccur-isearch))
-            (isearch-mb--after-exit
-             ("M-%" . anzu-isearch-query-replace)
-             ("M-s l" . consult-line))))
+                     ("M-e" .  consult-isearch)
+                     ("C-o" . loccur-isearch))
+                    (isearch-mb--after-exit
+                     ("M-%" . anzu-isearch-query-replace)
+                     ("M-s l" . consult-line))))
       (let ((isearch-mb-list (car spec))
-        (isearch-mb-binds (cdr spec)))
-    (dolist (cell isearch-mb-binds)
-      (let ((key (car cell))
-        (command (cdr cell)))
-        (when (fboundp command)
-          (add-to-list isearch-mb-list command)
-          (define-key isearch-mb-minibuffer-map (kbd key) command)))))))
+            (isearch-mb-binds (cdr spec)))
+        (dolist (cell isearch-mb-binds)
+          (let ((key (car cell))
+                (command (cdr cell)))
+            (when (fboundp command)
+              (add-to-list isearch-mb-list command)
+              (define-key isearch-mb-minibuffer-map (kbd key) command)))))))
   (isearch-mb-mode +1))
 
 (setup (:straight-when keychain-environment