Updating Doom Emacs.

.emacs.d/modules/emacs/dired/config.el

@@ -3,47 +3,44 @@
 (use-package! dired
   :commands dired-jump
   :init
-  (setq ;; Always copy/delete recursively
+  (setq dired-auto-revert-buffer t  ; don't prompt to revert; just do it
+        dired-dwim-target t  ; suggest a target for moving/copying intelligently
+        dired-hide-details-hide-symlink-targets nil
+        ;; Always copy/delete recursively
         dired-recursive-copies  'always
         dired-recursive-deletes 'top
-        ;; Instantly revert Dired buffers on re-visiting them, with no message.
-        ;; (A message is shown if insta-revert is either disabled or determined
-        ;; dynamically by setting this variable to a function.)
-        dired-auto-revert-buffer t
-        ;; Auto refresh dired, but be quiet about it
-        dired-hide-details-hide-symlink-targets nil
-        ;; make dired suggest a target for moving/copying intelligently
-        dired-dwim-target t
-        ;; files
+        ;; Where to store image caches
         image-dired-dir (concat doom-cache-dir "image-dired/")
         image-dired-db-file (concat image-dired-dir "db.el")
         image-dired-gallery-dir (concat image-dired-dir "gallery/")
         image-dired-temp-image-file (concat image-dired-dir "temp-image")
-        image-dired-temp-rotate-image-file (concat image-dired-dir "temp-rotate-image"))
+        image-dired-temp-rotate-image-file (concat image-dired-dir "temp-rotate-image")
+        ;; Screens are larger nowadays, we can afford slightly larger thumbnails
+        image-dired-thumb-size 150)
   :config
-  (let ((args (list "-aBhl" "--group-directories-first")))
+  (set-popup-rule! "^\\*image-dired"
+    :slot 20 :size 0.8 :select t :quit nil :ttl 0)
+  (set-evil-initial-state! 'image-dired-display-image-mode 'emacs)
+
+  (let ((args (list "-ahl" "-v" "--group-directories-first")))
     (when IS-BSD
       ;; Use GNU ls as `gls' from `coreutils' if available. Add `(setq
       ;; dired-use-ls-dired nil)' to your config to suppress the Dired warning
       ;; when not using GNU ls.
       (if-let (gls (executable-find "gls"))
           (setq insert-directory-program gls)
-        ;; BSD ls doesn't support --group-directories-first
-        (setq args (delete "--group-directories-first" args))))
-    (setq dired-listing-switches (string-join args " ")))
+        ;; BSD ls doesn't support -v or --group-directories-first
+        (setq args (list (car args)))))
+    (setq dired-listing-switches (string-join args " "))
 
-  (add-hook! 'dired-mode-hook
-    (defun +dired-disable-gnu-ls-flags-in-tramp-buffers-h ()
-      "Fix #1703: dired over TRAMP displays a blank screen.
+    (add-hook! 'dired-mode-hook
+      (defun +dired-disable-gnu-ls-flags-in-tramp-buffers-h ()
+        "Fix #1703: dired over TRAMP displays a blank screen.
 
 This is because there's no guarantee the remote system has GNU ls, which is the
 only variant that supports --group-directories-first."
-      (when (file-remote-p default-directory)
-        (setq-local dired-listing-switches
-                    (string-join
-                     (split-string dired-listing-switches
-                                   "--group-directories-first")
-                     " ")))))
+        (when (file-remote-p default-directory)
+          (setq-local dired-actual-switches (car args))))))
 
   ;; Don't complain about this command being disabled when we use it
   (put 'dired-find-alternate-file 'disabled nil)
@@ -64,7 +61,7 @@ only variant that supports --group-directories-first."
 
 
 (use-package! diff-hl
-  :hook (dired-mode . diff-hl-dired-mode)
+  :hook (dired-mode . diff-hl-dired-mode-unless-remote)
   :hook (magit-post-refresh . diff-hl-magit-post-refresh)
   :config
   ;; use margin instead of fringe
@@ -74,10 +71,7 @@ only variant that supports --group-directories-first."
 (use-package! ranger
   :when (featurep! +ranger)
   :after dired
-  :init
-  ;; set up image-dired to allow picture resize
-  (setq image-dired-dir (concat doom-cache-dir "image-dir")
-        ranger-override-dired t)
+  :init (setq ranger-override-dired t)
   :config
   (unless (file-directory-p image-dired-dir)
     (make-directory image-dired-dir))
@@ -122,13 +116,13 @@ we have to clean it up ourselves."
     (defvar +wdired-icons-enabled -1)
 
     (defadvice! +dired-disable-icons-in-wdired-mode-a (&rest _)
-      :before #'+wdired-before-start-advice
+      :before #'wdired-change-to-wdired-mode
       (setq-local +wdired-icons-enabled (if all-the-icons-dired-mode 1 -1))
       (when all-the-icons-dired-mode
         (all-the-icons-dired-mode -1)))
 
     (defadvice! +dired-restore-icons-after-wdired-mode-a (&rest _)
-      :after #'+wdired-after-finish-advice
+      :after #'wdired-change-to-dired-mode
       (all-the-icons-dired-mode +wdired-icons-enabled))))
 
 

.emacs.d/modules/emacs/dired/packages.el

@@ -1,12 +1,12 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; emacs/dired/packages.el
 
-(package! diredfl)
-(package! dired-git-info)
-(package! diff-hl)
-(package! dired-rsync)
+(package! diredfl :pin "83567d00affce66a4e501563eddd0bd436ac48d0")
+(package! dired-git-info :pin "b47f2b0c3a6cb9b7a62a4ee2605a492e512d40a9")
+(package! diff-hl :pin "a625033fb1dde83f6e4c2fc21f632b22ec34b609")
+(package! dired-rsync :pin "bfd5c155be1cb6b71c83e5f41116c81b6532b6d5")
 (when (featurep! +ranger)
-  (package! ranger))
+  (package! ranger :pin "ae9b3816a6da927cca5beb62c45400103797a2da"))
 (when (featurep! +icons)
-  (package! all-the-icons-dired))
-(package! fd-dired)
+  (package! all-the-icons-dired :pin "fc2dfa1e9eb8bf1c402a675e7089638d702a27a5"))
+(package! fd-dired :pin "001cc95effdd5c4d9974b3f2c40b2ddf1f0e3de2")