Port the rest of my GNU Emacs configuration to use-package

1 files changed, 21 insertions, 17 deletions

diff --git a/.emacs.d/lisp/bandali-ibuffer.el b/.emacs.d/lisp/bandali-ibuffer.el
index f818695..2c4f660 100644
--- a/.emacs.d/lisp/bandali-ibuffer.el
+++ b/.emacs.d/lisp/bandali-ibuffer.el
@@ -24,9 +24,23 @@
 
 ;;; Code:
 
-(with-eval-after-load 'ibuffer
-  (setopt
-   ibuffer-saved-filter-groups
+(use-package ibuffer
+  :defer t
+  :bind
+  (("C-x C-b" . ibuffer)
+   :map ibuffer-mode-map
+   ("P"   . ibuffer-backward-filter-group)
+   ("N"   . ibuffer-forward-filter-group)
+   ("M-p" . ibuffer-do-print)
+   ("M-n" . ibuffer-do-shell-command-pipe-replace))
+  :init
+  (declare-function
+   ibuffer-switch-to-saved-filter-groups "ibuf-ext" (name))
+  :hook
+  (ibuffer . (lambda ()
+               (ibuffer-switch-to-saved-filter-groups "default")))
+  :custom
+  (ibuffer-saved-filter-groups
    '(("default"
       ("dired" (mode . dired-mode))
       ("erc" (mode . erc-mode))
@@ -46,7 +60,9 @@
        (or
         (mode . tex-mode)
         (mode . bibtex-mode)
-        (mode . latex-mode)))))
+        (mode . latex-mode))))))
+  :config
+  (setopt
    ibuffer-formats
    `((mark modified read-only locked
            " " (name 18 18 :left :elide)
@@ -63,19 +79,7 @@
       (format "%7.0fK" (/ (buffer-size) 1024.0)))
      ((> (buffer-size) 1024)
       (format "%7.1fK" (/ (buffer-size) 1024.0)))
-     (t (format "%8d" (buffer-size)))))
-
-  (let ((m ibuffer-mode-map))
-    (b/keymap-set m "P" #'ibuffer-backward-filter-group)
-    (b/keymap-set m "N" #'ibuffer-forward-filter-group)
-    (b/keymap-set m "M-p" #'ibuffer-do-print)
-    (b/keymap-set m "M-n" #'ibuffer-do-shell-command-pipe-replace)))
-(b/keymap-global-set "C-x C-b" #'ibuffer)
-(declare-function
- ibuffer-switch-to-saved-filter-groups "ibuf-ext" (name))
-(add-hook
- 'ibuffer-hook
- (lambda () (ibuffer-switch-to-saved-filter-groups "default")))
+     (t (format "%8d" (buffer-size))))))
 
 (provide 'bandali-ibuffer)
 ;;; bandali-ibuffer.el ends here