Reorganize dired-mode setup

init.el

@@ -455,6 +455,10 @@ AKA, DO NOT USE THIS FUNCTION!!!"
 
 (setup dired
   (:also-load dired-x)
+  (:straight dired-subtree
+             dired-collapse
+             dired-git-info)
+  
   (:option dired-recursive-copies 'always
            dired-recursive-deletes 'always
            delete-by-moving-to-trash t
@@ -467,7 +471,12 @@ AKA, DO NOT USE THIS FUNCTION!!!"
                               shell touch symlink)
            dired-dwim-target t)
 
-  (:hook dired-hide-details-mode
+  (:bind "TAB" #'dired-subtree-cycle
+         "i" #'dired-subtree-toggle
+         ")" #'dired-git-info-mode)
+
+  (:hook dired-collapse-mode
+         dired-hide-details-mode
          hl-line-mode)
   
   (:global "C-x C-j" #'dired-jump)
@@ -479,20 +488,7 @@ AKA, DO NOT USE THIS FUNCTION!!!"
             (:bind "RET" #'dired-w32-browser))
      (:home (:straight dired-open)
             (autoload #'dired-find-alternate-file "dired-open" nil t)
-            (:bind "RET" #'dired-find-alternate-file)))
-
-    (: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)))
+            (:bind "RET" #'dired-find-alternate-file)))))
 
 (setup disabled
   ;; While this stuff is defined in novice.el, I'm using 'disabled' as the name