From 70026d07d0bef09468b93caabf9a1f425533a69a Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Mon, 10 Feb 2025 15:05:56 -0500 Subject: Drop use-package again I prefer my own manual approach, use-package feels too magical and at times does too much for me. --- .emacs.d/lisp/bandali-dired.el | 45 ++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 26 deletions(-) (limited to '.emacs.d/lisp/bandali-dired.el') diff --git a/.emacs.d/lisp/bandali-dired.el b/.emacs.d/lisp/bandali-dired.el index 982af2c..f0ebbc5 100644 --- a/.emacs.d/lisp/bandali-dired.el +++ b/.emacs.d/lisp/bandali-dired.el @@ -24,25 +24,12 @@ ;;; Code: -(use-package dired - :defer t - :init (require 'ls-lisp) - :bind - (:map - dired-mode-map - ("b" . dired-up-directory) - ("E" . dired-ediff-files) - ("e" . dired-toggle-read-only) - ("\\" . dired-hide-details-mode)) - :hook - (dired-mode . dired-hide-details-mode) - :custom - (dired-dwim-target-next t) - ;; (dired-listing-switches "-alh --group-directories-first") - (dired-listing-switches "-alh") - ;; (ls-lisp-dirs-first t) - (ls-lisp-use-insert-directory-program nil) - :config +(with-eval-after-load 'dired + (setopt + dired-dwim-target t + ;; dired-listing-switches "-alh --group-directories-first" + dired-listing-switches "-alh") + (declare-function dired-dwim-target-directory "dired-aux") ;; easily diff 2 marked files ;; https://oremacs.com/2017/03/18/dired-ediff/ @@ -66,13 +53,19 @@ (lambda () (setq ediff-after-quit-hook-internal nil) (set-window-configuration wnd)))) - (error "no more than 2 files should be marked"))))) + (error "no more than 2 files should be marked")))) + + ;; local key bindings + (let ((m dired-mode-map)) + (b/keymap-set m "b" #'dired-up-directory) + (b/keymap-set m "E" #'dired-ediff-files) + (b/keymap-set m "e" #'dired-toggle-read-only) + (b/keymap-set m "\\" #'dired-hide-details-mode)) -(use-package dired-x - :after dired - :custom - (dired-guess-shell-alist-user - '(("\\.pdf\\'" "atril" "evince" "zathura" "okular") + (require 'dired-x) + (setopt + dired-guess-shell-alist-user + '(("\\.pdf\\'" "atril" "evince") ("\\.doc\\'" "libreoffice") ("\\.docx\\'" "libreoffice") ("\\.ppt\\'" "libreoffice") @@ -80,7 +73,7 @@ ("\\.xls\\'" "libreoffice") ("\\.xlsx\\'" "libreoffice") ("\\.flac\\'" "mpv")))) - +(add-hook 'dired-mode-hook #'dired-hide-details-mode) (provide 'bandali-dired) ;;; bandali-dired.el ends here -- cgit v1.2.3-60-g2f50