From c21f21afab7514c312dae9bd500a703cd87c21cf Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Tue, 16 Mar 2021 09:29:53 -0500
Subject: "Package-ize" dired

---
 init.el | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

(limited to 'init.el')

diff --git a/init.el b/init.el
index d2d5b68..47b8462 100644
--- a/init.el
+++ b/init.el
@@ -367,29 +367,26 @@ indicator in the mode-line."
 	     (prog-mode-hook goto-address-prog-mode)))
 
 ;;; Dired
-
-(acdw/set `((dired-recursive-copies always)
+(acdw/pkg dired
+  :local t
+  :set `((dired-recursive-copies always)
 	    (dired-recursive-deletes always)
 	    (delete-by-moving-to-trash t)
 	    (dired-listing-switches "-Al")
 	    (ls-lisp-dirs-first t)
-	    (dired-dwim-target t)))
-
-(defun hook--dired-mode ()
-  (hl-line-mode +1)
-  (dired-hide-details-mode +1))
-(add-hook 'dired-mode-hook #'hook--dired-mode)
-
-(acdw/bind "C-x C-j" dired-jump :after "dired-x")
-
-(with-eval-after-load 'dired
-  ;; I tried `autoload'ing the keymap, and it just wouldn't work.  I have no
-  ;; idea what the issue was.
-  (acdw/pkg dired-subtree
-    :binds (("i" dired-subtree-toggle :map dired-mode-map))))
-
-(acdw/pkg dired-collapse
-  :hooks ((dired-mode-hook dired-collapse-mode)))
+	 (dired-dwim-target t))
+  :now ((autoload 'dired-mode-map "dired" nil nil 'keymap)
+	(acdw/pkg dired-subtree)
+	(acdw/pkg dired-x
+	  :local t
+	  :binds (("C-x C-j" dired-jump)))
+	(acdw/pkg dired-collapse
+	  :hooks ((dired-mode-hook dired-collapse-mode)))
+	(defun hook--dired-mode ()
+	  (hl-line-mode +1)
+	  (dired-hide-details-mode +1)))
+  :hooks ((dired-mode-hook hook--dired-mode))
+  :binds (("i" dired-subtree-toggle :map dired-mode-map)))
 
 ;;; Eshell
 
-- 
cgit 1.4.1-21-gabe81