format, move to use-package declarations

1 files changed, 28 insertions, 31 deletions

diff --git a/bard-emacs-modules/bard-emacs-dired.el b/bard-emacs-modules/bard-emacs-dired.el
index 0375417..41f8ee8 100644
--- a/bard-emacs-modules/bard-emacs-dired.el
+++ b/bard-emacs-modules/bard-emacs-dired.el
@@ -6,37 +6,38 @@
 (use-package wdired
   :ensure t)
 
-(define-key global-map (kbd "C-j") #'dired-jump)
-(add-hook 'org-mode-hook
-          (lambda()
-            (local-unset-key (kbd "C-j"))))
-
-(setq dired-guess-shell-alist-user ; those are the suggestions for ! and & in Dired
-      '(("\\.\\(png\\|jpe?g\\|tiff\\)" "nsxiv" "feh" "xdg-open")
-        ("\\.\\(mp[34]\\|m4a\\|ogg\\|flac\\|webm\\|mkv\\)" "mpv" "xdg-open")
-	(".gif" "mpv --loop=inf")
-        (".*" "xdg-open")))
-
-(add-hook 'dired-mode-hook #'dired-hide-details-mode)
-
-(add-hook 'dired-mode-hook
-          (lambda()
-            (define-key dired-mode-map (kbd "E") #'emms-add-dired)
-	    (define-key dired-mode-map (kbd "<tab>") #'dired-subtree-toggle)
-	    (define-key dired-mode-map (kbd "<backtab>") #'dired-subtree-cycle)))
-
-;; hook for attaching emails mode
-(add-hook 'dired-mode-hook #'turn-on-gnus-dired-mode)
+(use-package dired
+  :bind*
+  (("C-j" . dired-jump))
+  :bind (:map dired-mode-map
+              (("E" . emms-add-dired)
+               ("<tab>" . dired-subtree-toggle)
+               ("<backtab>" . dired-subtree-cycle)))
+  :config
+  (setq dired-guess-shell-alist-user ; those are the suggestions for ! and & in Dired
+        '(("\\.\\(png\\|jpe?g\\|tiff\\)" "nsxiv" "feh" "xdg-open")
+          ("\\.\\(mp[34]\\|m4a\\|ogg\\|flac\\|webm\\|mkv\\)" "mpv" "xdg-open")
+	      (".gif" "mpv --loop=inf")
+          (".*" "xdg-open")))
+  :hook
+  ((dired-mode . dired-hide-details-mode)
+   ;; attachments for email through dired
+   (dired-mode . turn-on-gnus-dired-mode)))
 
 (setq dired-dwim-target t)
 
 ;; Image dired
-(setq image-dired-thumbnail-storage 'standard)
-(setq image-dired-external-viewer "nsxiv")
-(setq image-dired-thumb-size 80)
-(setq image-dired-thumb-margin 2)
-(setq image-dired-thumb-relief 0)
-(setq image-dired-thumbs-per-row 4)
+(use-package image-dired
+  :bind
+  (:map dired-mode-map
+        ((")" . image-dired-dired-display-external)))
+  :config
+  (setq image-dired-thumbnail-storage 'standard)
+  (setq image-dired-external-viewer "nsxiv")
+  (setq image-dired-thumb-size 80)
+  (setq image-dired-thumb-margin 2)
+  (setq image-dired-thumb-relief 0)
+  (setq image-dired-thumbs-per-row 4))
 
 ;; Taken from https://superuser.com/a/176629
 (defun bard/dired-do-command (command)
@@ -49,7 +50,3 @@ open and unsaved."
             (find-file filename)
             (call-interactively command))
           (dired-get-marked-files))))
-
-
-;; (define-key image-dired-thumbnail-mode-map
-;; 	    (kbd "<return>") #'image-dired-thumbnail-display-external)