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, 68 insertions, 66 deletions

diff --git a/.emacs.d/lisp/bandali-misc.el b/.emacs.d/lisp/bandali-misc.el
index 1c5bfd2..5390615 100644
--- a/.emacs.d/lisp/bandali-misc.el
+++ b/.emacs.d/lisp/bandali-misc.el
@@ -24,70 +24,73 @@
 
 ;;; Code:
 
-(use-package debbugs
-  :ensure t
-  :bind
-  ("C-c D d" . debbugs-gnu)
-  ("C-c D b" . debbugs-gnu-bugs)
-  ("C-c D e" . (lambda ()               ; bug-gnu-emacs
-                 (interactive)         
-                 (setq debbugs-gnu-current-suppress t)
-                 (debbugs-gnu debbugs-gnu-default-severities
-                              '("emacs"))))
-  ("C-c D g" . (lambda ()               ; bug-gnuzilla
-                 (interactive)
-                 (setq debbugs-gnu-current-suppress t)
-                 (debbugs-gnu debbugs-gnu-default-severities
-                              '("gnuzilla")))))
+;; `delight'
+(run-with-idle-timer 0.5 nil #'require 'delight nil 'noerror)
+(with-eval-after-load 'delight
+  (delight 'auto-fill-function " f" "simple")
+  (delight 'abbrev-mode nil "abbrev")
+  (delight 'completion-preview-mode " cprev" "completion-preview")
+  (delight 'mml-mode " mml" "mml"))
 
-(use-package ffs
-  :load-path "lisp/ffs"
-  ;; :defer 0.5
-  :hook
-  ((ffs-start
-    .
-    (lambda ()
-      (mapc
-       (lambda (mode) (funcall mode 1)) ; enable
-       '(ffs--no-mode-line-minor-mode
-         ffs--no-cursor-minor-mode))
-      (mapc
-       (lambda (mode) (funcall mode -1)) ; disable
-       '(show-paren-local-mode
-         display-battery-mode
-         display-fill-column-indicator-mode
-         flyspell-mode
-         tool-bar-mode
-         menu-bar-mode
-         scroll-bar-mode))
-      (fringe-mode 0)))
-   (ffs-quit
-    .
-    (lambda ()
-      (mapc
-       (lambda (mode) (funcall mode -1)) ; disable
-       '(ffs--no-mode-line-minor-mode
-         ffs--no-cursor-minor-mode))
-      (mapc
-       (lambda (mode) (funcall mode 1)) ; enable
-       '(show-paren-local-mode
-         display-battery-mode
-         display-fill-column-indicator-mode
-         flyspell-mode
-         tool-bar-mode
-         menu-bar-mode
-         scroll-bar-mode))
-      (fringe-mode nil))))
-  :commands ffs
-  :bind
-  ("C-c f s" . ffs)
-  :custom
-  (ffs-default-face-height 250))
+;; `debbugs'
+(b/keymap-global-set "C-c D d" #'debbugs-gnu)
+(b/keymap-global-set "C-c D b" #'debbugs-gnu-bugs)
+(b/keymap-global-set "C-c D e"          ; bug-gnu-emacs
+                (lambda ()
+                  (interactive)         
+                  (setq debbugs-gnu-current-suppress t)
+                  (debbugs-gnu debbugs-gnu-default-severities
+                               '("emacs"))))
+(b/keymap-global-set "C-c D g"          ; bug-gnuzilla
+                (lambda ()
+                  (interactive)
+                  (setq debbugs-gnu-current-suppress t)
+                  (debbugs-gnu debbugs-gnu-default-severities
+                               '("gnuzilla"))))
 
-(use-package debian-el
-  :load-path "lisp/debian-el"
-  :defer 0.5
-  :config
+(add-to-list 'load-path (b/emacs.d "lisp/ffs"))
+;; (run-with-idle-timer 0.5 nil #'require 'ffs)
+(with-eval-after-load 'ffs
+  (setopt ffs-default-face-height 250))
+(add-hook 'ffs-start-hook
+          (lambda ()
+            (mapc
+             (lambda (mode) (funcall mode 1)) ; enable
+             '(ffs--no-mode-line-minor-mode
+               ffs--no-cursor-minor-mode))
+            (mapc
+             (lambda (mode) (funcall mode -1)) ; disable
+             '(show-paren-local-mode
+               display-battery-mode
+               display-fill-column-indicator-mode
+               flyspell-mode
+               tool-bar-mode
+               menu-bar-mode
+               scroll-bar-mode))
+            (fringe-mode 0)))
+(add-hook 'ffs-quit-hook
+          (lambda ()
+            (mapc
+             (lambda (mode) (funcall mode -1)) ; disable
+             '(ffs--no-mode-line-minor-mode
+               ffs--no-cursor-minor-mode))
+            (mapc
+             (lambda (mode) (funcall mode 1)) ; enable
+             '(show-paren-local-mode
+               display-battery-mode
+               display-fill-column-indicator-mode
+               flyspell-mode
+               tool-bar-mode
+               menu-bar-mode
+               scroll-bar-mode))
+            (fringe-mode nil)))
+(unless (fboundp 'ffs)
+  (autoload #'ffs "ffs" nil t))
+(b/keymap-global-set "C-c f s" #'ffs)
+
+(add-to-list 'load-path (b/emacs.d "lisp/debian-el"))
+(run-with-idle-timer 0.5 nil #'require 'debian-el)
+(with-eval-after-load 'debian-el
   (require 'apt-sources)
   (require 'apt-utils)
   (require 'debian-bug)
@@ -95,10 +98,9 @@
   (require 'gnus-BTS)
   (require 'preseed))
 
-(use-package dpkg-dev-el
-  :load-path "lisp/dpkg-dev-el"
-  :defer 0.5
-  :config
+(add-to-list 'load-path (b/emacs.d "lisp/dpkg-dev-el"))
+(run-with-idle-timer 0.5 nil #'require 'dpkg-dev-el)
+(with-eval-after-load 'dpkg-dev-el
   (require 'debian-changelog-mode)
   (require 'debian-bts-control)
   (require 'debian-changelog-mode)