Migrate from using Borg to ELPA

[~bandali/configs] / lisp / bandali-ebdb.el

diff --git a/lisp/bandali-ebdb.el b/lisp/bandali-ebdb.el
index a7315c4..4d21978 100644 (file)
--- a/lisp/bandali-ebdb.el
+++ b/lisp/bandali-ebdb.el
@@ -24,48 +24,29 @@
 
 ;;; Code:
 
-(use-package ebdb
-  :demand
-  :after gnus
-  :bind (:map gnus-group-mode-map ("e" . ebdb))
-  :config
-  (setq ebdb-sources (b/var "ebdb"))
+(with-eval-after-load 'gnus
+  (require 'ebdb)
+  (csetq ebdb-sources (b/var "ebdb"))
   (with-eval-after-load 'swiper
-    (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t)))
+    (add-to-list 'swiper-font-lock-exclude #'ebdb-mode t))
+  ;; local key bindings
+  (define-key gnus-group-mode-map (kbd "e") #'ebdb))
 
-(use-package ebdb-com
-  :after ebdb)
+(with-eval-after-load 'ebdb
+  (with-eval-after-load 'ebdb-complete
+    ;; (csetq ebdb-complete-mail 'capf)
+    (ebdb-complete-enable))
 
-(use-package ebdb-complete
-  :after ebdb
-  :config
-  ;; (setq ebdb-complete-mail 'capf)
-  (ebdb-complete-enable))
+  (require 'ebdb-message)
+  
+  (require 'ebdb-gnus)
+  (csetq ebdb-gnus-window-size 0.3)
 
-(use-package ebdb-message
-  :demand
-  :after ebdb)
+  (require 'ebdb-mua)
+  (csetq ebdb-mua-pop-up t))
 
-;; (use-package company-ebdb
-;;   :config
+;; (with-eval-after-load 'company-ebdb
 ;;   (defun company-ebdb--post-complete (_) nil))
 
-(use-package ebdb-gnus
-  :demand
-  :after ebdb
-  :custom
-  (ebdb-gnus-window-size 0.3))
-
-(use-package ebdb-mua
-  :demand
-  :after ebdb
-  :custom (ebdb-mua-pop-up t))
-
-;; (use-package ebdb-message
-;;   :after ebdb)
-
-;; (use-package ebdb-vcard
-;;   :after ebdb)
-
 (provide 'bandali-ebdb)
 ;;; bandali-ebdb.el ends here