Setup `dired' better

Instead of resetting `setup-*' in each of dired's dependent packages, just
install them using `:straight' and configure them in blocks.

1 files changed, 21 insertions, 21 deletions

@@ -508,27 +508,27 @@
   (:hook dired-hide-details-mode
          hl-line-mode)
   (:global "C-x C-j" dired-jump)
-  (:bind "RET" dired-find-alternate-file)
-  (with-eval-after-load 'dired
-    (pcase acdw/system
-      (:work (setup (:straight w32-browser)
-               (define-key dired-mode-map (kbd "RET") #'dired-w32-browser)))
-      (:home (setup (:straight dired-open)
-               (:option (prepend dired-open-functions) dired-open-xdg))))
-    
-    (setup (:straight dired-subtree)
-      (:with-map dired-mode-map
-        (:bind "i" dired-subtree-toggle
-               "TAB" dired-subtree-cycle)))
-
-    (setup (:straight dired-collapse)
-      (:hook-into dired-mode))
-
-    (setup (:straight dired-git-info)
-      (define-key dired-mode-map ")" #'dired-git-info-mode))
-
-    (setup (:straight trashed)
-      (setq-default trashed-action-confirmer #'y-or-n-p))))
+
+  (pcase acdw/system
+    (:work (:straight w32-browser)
+           (autoload 'dired-w32-browser "w32-browser")
+           (:bind "RET" dired-w32-browser))
+    (:home (:straight dired-open)
+           (:bind "RET" dired-find-alternate-file)
+           (:option (prepend dired-open-functions) dired-open-xdg)))
+
+  (:straight dired-subtree)
+  (:bind "i" dired-subtree-toggle
+         "TAB" dired-subtree-cycle)
+
+  (:straight dired-collapse)
+  (:hook dired-collapse-mode)
+
+  (:straight dired-git-info)
+  (:bind ")" dired-git-info-mode)
+
+  (:straight trashed)
+  (:option trashed-action-confirmer #'y-or-n-p))
 
 (setup (:straight magit)
   (:leader "g" magit-status)