Rearrange dired stuff

1 files changed, 14 insertions, 16 deletions

@@ -168,9 +168,7 @@
                                    hardlink load move
                                    shell touch symlink)
                 dired-dwim-target t)
-  
-  (:also-load dired-x)
-  
+
   (:hook dired-hide-details-mode
          hl-line-mode)
   
@@ -182,22 +180,22 @@
           (:bind "RET" dired-w32-browser))
    (:home (:straight dired-open)
           (require 'dired-open)
-          (:bind "RET" dired-find-alternate-file)
-          (:option (prepend dired-open-functions) #'dired-open-xdg)))
-  
-  (:when-loaded
-   (:straight dired-subtree)
-   (:bind "i" dired-subtree-toggle
-          "TAB" dired-subtree-cycle)
+          (:bind "RET" dired-find-alternate-file)))
+
+  (with-eval-after-load 'dired
+    (require 'dired-x)
+    (:straight dired-subtree)
+    (:bind "i" dired-subtree-toggle
+           "TAB" dired-subtree-cycle)
 
-   (:straight dired-collapse)
-   (:hook dired-collapse-mode)
+    (:straight dired-collapse)
+    (:hook dired-collapse-mode)
 
-   (:straight dired-git-info)
-   (:bind ")" dired-git-info-mode)
+    (:straight dired-git-info)
+    (:bind ")" dired-git-info-mode)
 
-   (:straight trashed)
-   (:option trashed-action-confirmer #'y-or-n-p)))
+    (:straight trashed)
+    (:option trashed-action-confirmer #'y-or-n-p)))
 
 (setup disabled
   ;; While this stuff is defined in novice.el, I'm using 'disabled' as the name