From: Amin Bandali Date: Mon, 13 Apr 2020 03:45:58 +0000 (-0400) Subject: Assimilate EBDB and move email setup to separate files in lisp/ X-Git-Url: https://git.shemshak.org/~bandali/configs/commitdiff_plain/e2178fd3f770735f942409300876a0d22c470a0d Assimilate EBDB and move email setup to separate files in lisp/ Gnus for reading, message for writing, and EBDB for contacts. --- diff --git a/.gitmodules b/.gitmodules index 003c015..d341bbc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,6 +18,9 @@ # that the submodule is dirty. so, let's ignore the untracked # files of dash's submodule ignore = untracked +[submodule "ebdb"] + path = lib/ebdb + url = https://github.com/girzel/ebdb.git [submodule "ivy"] path = lib/ivy url = https://github.com/abo-abo/swiper.git diff --git a/init.el b/init.el index 56e2e48..57861bb 100644 --- a/init.el +++ b/init.el @@ -640,16 +640,16 @@ For disabling the behaviour for certain buffers and/or modes." :bind (:map doc-view-mode-map ("M-RET" . image-previous-line))) +;; Email (with Gnus, message, and EBDB) (require 'bandali-gnus) - (use-package sendmail :config (setq sendmail-program (executable-find "msmtp") ;; message-sendmail-extra-arguments '("-v" "-d") mail-specify-envelope-from t mail-envelope-from 'header)) - (require 'bandali-message) +(require 'bandali-ebdb) ;;; Editing @@ -1367,84 +1367,6 @@ For disabling the behaviour for certain buffers and/or modes." (getenv "XDG_DOWNLOAD_DIR")))) -;;; Email - -(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 'swiper - (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t))) - -(use-package ebdb-com - :after ebdb) - -(use-package ebdb-complete - :after ebdb - :config - ;; (setq ebdb-complete-mail 'capf) - (ebdb-complete-enable)) - -(use-package ebdb-message - :demand - :after ebdb) - -;; (use-package company-ebdb -;; :config -;; (defun company-ebdb--post-complete (_) nil)) - -(use-package ebdb-gnus - :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) - -(use-package message-x) - -(comment - (use-package message-x - :custom - (message-x-completion-alist - (quote - (("\\([rR]esent-\\|[rR]eply-\\)?[tT]o:\\|[bB]?[cC][cC]:" . gnus-harvest-find-address) - ((if - (boundp - (quote message-newgroups-header-regexp)) - message-newgroups-header-regexp message-newsgroups-header-regexp) - . message-expand-group)))))) - -(comment - (use-package gnus-harvest - :commands gnus-harvest-install - :demand t - :config - (if (featurep 'message-x) - (gnus-harvest-install 'message-x) - (gnus-harvest-install)))) - -(use-package gnus-article-treat-patch - :disabled - :demand - :load-path "lisp/" - :config - ;; note: be sure to customize faces with `:foreground "white"' when - ;; using a theme with a white/light background :) - (setq ft/gnus-article-patch-conditions - '("^@@ -[0-9]+,[0-9]+ \\+[0-9]+,[0-9]+ @@"))) - - ;;; IRC (with ERC and ZNC) (use-package erc diff --git a/lib/ebdb b/lib/ebdb new file mode 160000 index 0000000..15fdedb --- /dev/null +++ b/lib/ebdb @@ -0,0 +1 @@ +Subproject commit 15fdedb14666ac2b5013b0350a72eb0e08efe201 diff --git a/lisp/bandali-ebdb.el b/lisp/bandali-ebdb.el new file mode 100644 index 0000000..8b8f3c0 --- /dev/null +++ b/lisp/bandali-ebdb.el @@ -0,0 +1,44 @@ +(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 'swiper + (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t))) + +(use-package ebdb-com + :after ebdb) + +(use-package ebdb-complete + :after ebdb + :config + ;; (setq ebdb-complete-mail 'capf) + (ebdb-complete-enable)) + +(use-package ebdb-message + :demand + :after ebdb) + +;; (use-package company-ebdb +;; :config +;; (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) diff --git a/lisp/bandali-gnus.el b/lisp/bandali-gnus.el index f3fa118..bb5ea02 100644 --- a/lisp/bandali-gnus.el +++ b/lisp/bandali-gnus.el @@ -408,4 +408,14 @@ https://csclub.uwaterloo.ca/~abandali") (mml-secure-openpgp-encrypt-to-self t) (mml-secure-openpgp-sign-with-sender t)) +(use-package gnus-article-treat-patch + :disabled + :demand + :load-path "lisp/" + :config + ;; note: be sure to customize faces with `:foreground "white"' when + ;; using a theme with a white/light background :) + (setq ft/gnus-article-patch-conditions + '("^@@ -[0-9]+,[0-9]+ \\+[0-9]+,[0-9]+ @@"))) + (provide 'bandali-gnus) diff --git a/lisp/bandali-message.el b/lisp/bandali-message.el index 491b6e2..33bebc9 100644 --- a/lisp/bandali-message.el +++ b/lisp/bandali-message.el @@ -66,4 +66,27 @@ ("r" . footnote-renumber-footnotes) ("s" . footnote-set-style))) +(use-package message-x) + +(comment + (use-package message-x + :custom + (message-x-completion-alist + (quote + (("\\([rR]esent-\\|[rR]eply-\\)?[tT]o:\\|[bB]?[cC][cC]:" . gnus-harvest-find-address) + ((if + (boundp + (quote message-newgroups-header-regexp)) + message-newgroups-header-regexp message-newsgroups-header-regexp) + . message-expand-group)))))) + +(comment + (use-package gnus-harvest + :commands gnus-harvest-install + :demand + :config + (if (featurep 'message-x) + (gnus-harvest-install 'message-x) + (gnus-harvest-install)))) + (provide 'bandali-message)