1 files changed, 19 insertions, 20 deletions

@@ -253,10 +253,7 @@
 
 (setup dired
   (:also-load dired-x)
-  (:also-straight dired-subtree
-                  dired-collapse
-                  dired-git-info
-                  dired+)
+  (:also-straight dired+)
   (:option dired-recursive-copies 'always
            dired-recursive-deletes 'always
            dired-create-destination-dirs 'always
@@ -265,7 +262,7 @@
            dired-isearch-filenames 'dwim
            delete-by-moving-to-trash t
            dired-auto-revert-buffer t
-           dired-listing-switches "-Al"
+           dired-listing-switches "-AlF"
            ls-lisp-dirs-first t
            dired-ls-F-marks-symlinks t
            dired-clean-confirm-killing-deleted-buffers nil
@@ -275,27 +272,29 @@
                               shell touch)
            dired-dwim-target t)
   (:local-set truncate-lines t)
-  (:bind "<backspace>" #'dired-up-directory
-         "TAB" #'dired-subtree-cycle
-         "i" #'dired-subtree-toggle
-         ")" #'dired-git-info-mode)
-  (:hook #'dired-collapse-mode
-         #'dired-hide-details-mode
-         #'hl-line-mode)
+  (:bind "<backspace>" #'dired-up-directory)
+  (:hook #'dired-hide-details-mode
+         #'hl-line-mode
+         #'lin-mode)
   (:+key "C-x C-j" #'dired-jump)
   (dolist (refresh-after-func '(dired-do-flagged-delete))
     (advice-add refresh-after-func :after #'revert-buffer))
-  (with-eval-after-load 'dired
-    (cl-case system-type
-      ((windows-nt ms-dos)
-       (:straight w32-browser))
-      (gnu/linux
-       (:straight dired-open)
-       (:option dired-listing-switches
-                (concat dired-listing-switches " -F")))))
   (with-eval-after-load 'frowny
     (add-to-list 'frowny-inhibit-modes #'dired-mode)))
 
+(setup ehelp
+  ;; Trying this instead of `helpful'
+  (:global [help] 'ehelp-command
+           [f1] 'ehelp-command)
+  (with-eval-after-load 'vertico-multiform
+    (dolist (cmd '(electric-describe-key
+                   electric-describe-mode
+                   electric-describe-syntax
+                   electric-describe-bindings
+                   electric-describe-function
+                   electric-describe-variable))
+      (setf (alist-get cmd vertico-multiform-commands) nil))))
+
 (setup eldoc
   (:hook-into elisp-mode
               lisp-interaction-mode))