Drop use-package again

I prefer my own manual approach, use-package feels too magical and
at times does too much for me.

1 files changed, 19 insertions, 23 deletions

diff --git a/.emacs.d/lisp/bandali-ibuffer.el b/.emacs.d/lisp/bandali-ibuffer.el
index 2c4f660..909f7b8 100644
--- a/.emacs.d/lisp/bandali-ibuffer.el
+++ b/.emacs.d/lisp/bandali-ibuffer.el
@@ -24,23 +24,9 @@
 
 ;;; Code:
 
-(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
+(with-eval-after-load 'ibuffer
+  (setopt
+   ibuffer-saved-filter-groups
    '(("default"
       ("dired" (mode . dired-mode))
       ("erc" (mode . erc-mode))
@@ -60,16 +46,14 @@
        (or
         (mode . tex-mode)
         (mode . bibtex-mode)
-        (mode . latex-mode))))))
-  :config
-  (setopt
+        (mode . latex-mode)))))
    ibuffer-formats
    `((mark modified read-only locked
            " " (name 18 18 :left :elide)
-           " " (size-h 9 -1 :right)
+           " " (size-h 9 -1 :right)     ; human-readable size
            " " (mode 16 16 :left :elide) " " filename-and-process)
      ,@ibuffer-formats))
-  ;; Use human readable Size column instead of original one
+  ;; Use human readable Size column instead of original one.
   (define-ibuffer-column size-h
     (:name "Size" :inline t)
     (cond
@@ -79,7 +63,19 @@
       (format "%7.0fK" (/ (buffer-size) 1024.0)))
      ((> (buffer-size) 1024)
       (format "%7.1fK" (/ (buffer-size) 1024.0)))
-     (t (format "%8d" (buffer-size))))))
+     (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")))
 
 (provide 'bandali-ibuffer)
 ;;; bandali-ibuffer.el ends here