From e23aff47774180caeff994085eb6ac7df73136db Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 28 Nov 2022 23:35:03 -0500
Subject: [PATCH] (Re)add SFL mail

---
 .config/isync/mbsyncrc        | 31 +++++++++++++++++++++++++++++++
 .emacs.d/etc/eshell/aliases   |  2 +-
 .emacs.d/lisp/bandali-gnus.el | 13 +++++++------
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/.config/isync/mbsyncrc b/.config/isync/mbsyncrc
index 25a2a08..59b98bc 100644
--- a/.config/isync/mbsyncrc
+++ b/.config/isync/mbsyncrc
@@ -128,3 +128,34 @@ Channel canonical
 Master :canonical-remote:
 Slave :canonical-local:
 Patterns *
+
+######
+IMAPAccount sfl
+Host mail.savoirfairelinux.com
+User amin.bandali
+PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/sfl.gpg"
+SSLType IMAPS
+
+IMAPStore sfl-remote
+Account sfl
+
+IMAPAccount sfl-local
+Host 127.0.0.1
+Port 143
+User amin.bandali@savoirfairelinux.local
+PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/sfl-local.gpg"
+SSLType None
+
+IMAPStore sfl-local
+Account sfl-local
+
+Channel sfl
+Master :sfl-remote:
+Slave :sfl-local:
+Patterns * !"Jami Sales&IBk-s"* !"Jami&IBk-s"*
+
+Channel sflro
+Master :sfl-remote:
+Slave :sfl-local:
+Sync Pull
+Patterns "Jami Sales&IBk-s"* "Jami&IBk-s"*
diff --git a/.emacs.d/etc/eshell/aliases b/.emacs.d/etc/eshell/aliases
index 418aad6..923a884 100644
--- a/.emacs.d/etc/eshell/aliases
+++ b/.emacs.d/etc/eshell/aliases
@@ -17,5 +17,5 @@ alias vi find-file $1
 alias vim find-file $1
 alias mbsync mbsync -c $XDG_CONFIG_HOME/isync/mbsyncrc $*
 alias getmail getmail --getmaildir $XDG_CONFIG_HOME/getmail --rcfile getmailrc $*
-alias m mbsync csclub; mbsync kelar; mbsync shemshak; mbsync gnub; getmail
+alias m mbsync csclub; mbsync kelar; mbsync shemshak; mbsync gnub; mbsync sfl; mbsync sflro; getmail
 alias mc mbsync canonical
diff --git a/.emacs.d/lisp/bandali-gnus.el b/.emacs.d/lisp/bandali-gnus.el
index d8949ed..53ae41e 100644
--- a/.emacs.d/lisp/bandali-gnus.el
+++ b/.emacs.d/lisp/bandali-gnus.el
@@ -156,12 +156,13 @@
             ("X-Spam-Flag" "YES" "Junk")
             ;; catch-all
             "INBOX")))
-         ;; (nnimap
-         ;;  "sfl"
-         ;;  (nnimap-stream tls)
-         ;;  (nnimap-address "mail.savoirfairelinux.com")
-         ;;  (nnimap-user "amin.bandali"))
-         )))
+         (nnimap
+          "sfl"
+          (nnimap-stream plain)
+          (nnimap-address "127.0.0.1")
+          (nnimap-server-port 143)
+          (nnimap-authenticator plain)
+          (nnimap-user "amin.bandali@savoirfairelinux.local")))))
  gnus-message-archive-group "nnimap+gnu:INBOX"
  gnus-parameters
  '(("l\\.deepspec"
-- 
2.20.1