emacs/dired: move ranger module to ranger feature in dired module

modules/emacs/dired/config.el

@@ -17,6 +17,17 @@
         image-dired-temp-image-file (concat image-dired-dir "temp-image")
         image-dired-temp-rotate-image-file (concat image-dired-dir "temp-rotate-image"))
   :config
+  ;; 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.  We must look for `gls' after `exec-path-from-shell' was
+  ;; initialized to make sure that `gls' is in `exec-path'
+  (when IS-MAC
+    (let ((gls (executable-find "gls")))
+      (if gls
+          (setq insert-directory-program gls)
+        (message "Please install `gls` using `brew instal coreutils`..."))))
+  (setq dired-listing-switches "-aBhl --group-directories-first")
+
   (defun +dired|sort-directories-first ()
     "List directories first in dired buffers."
     (save-excursion
@@ -42,6 +53,7 @@
 
 
 (def-package! dired-k
+  :unless (featurep! +ranger)
   :hook (dired-initial-position . dired-k)
   :hook (dired-after-readin . dired-k-no-revert)
   :config
@@ -60,6 +72,47 @@
   (advice-add #'dired-k--highlight :around #'+dired*dired-k-highlight))
 
 
+(def-package! ranger
+  :when (featurep! +ranger)
+  :init
+  (defun ranger/dired-setup ()
+    (setq dired-omit-verbose nil)
+    (make-local-variable 'dired-hide-details-hide-symlink-targets)
+    (setq dired-hide-details-hide-symlink-targets nil)
+    ;; hide details by default
+    (dired-hide-details-mode t))
+  (add-hook 'dired-mode-hook #'ranger/dired-setup)
+
+  (setq ranger-override-dired t)
+  :config
+  ;; set up image-dired to allow picture resize
+  (setq image-dired-dir (concat doom-cache-dir "image-dir"))
+  (unless (file-directory-p image-dired-dir)
+    (make-directory image-dired-dir))
+
+  (setq ranger-omit-regexp "^\.DS_Store$"
+        ranger-excluded-extensions '("mkv" "iso" "mp4")
+        ranger-deer-show-details nil
+        ranger-max-preview-size 10))
+
+
+(def-package! all-the-icons-dired
+  :when (featurep! +icons)
+  :defer t
+  :init
+  (when (display-graphic-p)
+    (add-hook! 'dired-mode-hook #'all-the-icons-dired-mode)))
+
+
+(def-package! font-lock+
+  :when (featurep! +icons))
+
+
+(def-package! dired-x
+  :defer t
+  :commands dired-omit-mode
+  :hook (dired-mode . dired-omit-mode))
+
 ;;
 ;; Evil integration
 
@@ -155,7 +208,7 @@
       :n "r" #'dired-do-redisplay
       :n "m" #'dired-mark
       :n "t" #'dired-toggle-marks
-      :n "u" #'dired-unmark                   ; also "*u"
+      :n "u" #'dired-unmark             ; also "*u"
       :n "W" #'browse-url-of-dired-file
       :n "x" #'dired-do-flagged-delete
       :n "gy" #'dired-show-file-type ;; FIXME: This could probably go on a better key.

modules/emacs/dired/packages.el

@@ -2,4 +2,8 @@
 ;;; emacs/dired/packages.el
 
 (package! dired-k)
-
+(when (featurep! +ranger)
+  (package! ranger))
+(when (featurep! +icons)
+  (package! all-the-icons-dired)
+  (package! font-lock+ :recipe (:fetcher github :repo "emacsmirror/font-lock-plus")))

modules/emacs/ranger/autoload.el

@@ -1,12 +0,0 @@
-;;; private/ranger/autoload.el -*- lexical-binding: t; -*-
-
-;;;###autoload
-(defun +my/dired-setup ()
-  (setq dired-omit-verbose nil)
-  (make-local-variable 'dired-hide-details-hide-symlink-targets)
-  (setq dired-hide-details-hide-symlink-targets nil)
-
-  ;; hide details by default
-  (dired-hide-details-mode t)
-  ;; omit the .. in dired
-  (dired-omit-mode t))

modules/emacs/ranger/config.el

@@ -1,42 +0,0 @@
-;;; private/ranger/config.el -*- lexical-binding: t; -*-
-
-(def-package! dired
-  :hook (dired-mode . +my/dired-setup)
-  :config
-  ;; 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.  We must look for `gls' after `exec-path-from-shell' was
-  ;; initialized to make sure that `gls' is in `exec-path'
-  (when IS-MAC
-    (let ((gls (executable-find "gls")))
-      (if gls
-          (setq insert-directory-program gls)
-        (message "Please install `gls` using `brew instal coreutils`..."))))
-  (setq dired-listing-switches "-aBhl --group-directories-first"))
-
-
-(def-package! ranger
-  :init
-  (setq ranger-override-dired t)
-  ;; set up image-dired to allow picture resize
-  (setq image-dired-dir (concat doom-cache-dir "image-dir"))
-  (unless (file-directory-p image-dired-dir)
-    (make-directory image-dired-dir))
-  :config
-  (setq ranger-omit-regexp "^\.DS_Store$"
-        ranger-excluded-extensions '("mkv" "iso" "mp4")
-        ranger-deer-show-details nil
-        ranger-max-preview-size 10))
-
-
-(def-package! all-the-icons-dired
-  :defer t
-  :init
-  (when (display-graphic-p)
-    (add-hook! 'dired-mode-hook #'all-the-icons-dired-mode)))
-
-
-(def-package! font-lock+)
-
-
-(def-package! dired-x)

modules/emacs/ranger/packages.el

@@ -1,6 +0,0 @@
-;; -*- no-byte-compile: t; -*-
-;;; private/ranger/packages.el
-
-(package! ranger)
-(package! all-the-icons-dired)
-(package! font-lock+ :recipe (:fetcher github :repo "emacsmirror/font-lock-plus"))