mail: setup fpp mail

diff --git a/mbsync/config b/mbsync/config
index 62bffc565b10a50a06297e11dc1833f0db2475d0..11aa5d75d2a33e47d0a4892f74781c0e0fabc170 100644 (file)
--- a/mbsync/config
+++ b/mbsync/config
@@ -61,50 +61,56 @@ Channel mailfence/bin
 Channel mailfence/youtube
 Channel mailfence/archive
 
-IMAPAccount     wio
-Host            outlook.office365.com
-User            sbenmendil@witekio.com
-PassCmd         "~/.config/mutt/mutt_oauth2.py ~/.cache/mutt_oauth2/sbenmendil@witekio.com.tokens"
+IMAPAccount     fpp
+Host            imap.gmail.com
+User            samir@fppnt.com
+PassCmd         "~/.config/mutt/mutt_oauth2.py ~/.cache/mutt_oauth2/samir@fppnt.com.tokens"
 AuthMechs       XOAUTH2
 SSLType         IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
-IMAPStore wio-remote
-Account wio
+IMAPStore fpp-remote
+Account fpp
 
-MaildirStore wio-local
-Path         ~/mail/wio/
-Inbox        ~/mail/wio/inbox/
+MaildirStore fpp-local
+Path         ~/mail/fpp/
+Inbox        ~/mail/fpp/inbox/
 SubFolders   Verbatim
 
-Channel wio/inbox
-Far  :wio-remote:
-Near :wio-local:
-
-Channel wio/archive
-Far  :wio-remote:"Archive"
-Near :wio-local:"archive"
-
-Channel wio/drafts
-Far  :wio-remote:"Drafts"
-Near :wio-local:"drafts"
-
-Channel wio/sent
-Far  :wio-remote:"Sent Items"
-Near :wio-local:"sent"
-
-Channel wio/spam
-Far  :wio-remote:"Junk Email"
-Near :wio-local:"spam"
-
-Channel wio/bin
-Far  :wio-remote:"Deleted Items"
-Near :wio-local:"bin"
-
-Group wio
-Channel wio/inbox
-Channel wio/archive
-Channel wio/drafts
-Channel wio/sent
-Channel wio/spam
-Channel wio/bin
+Channel fpp/inbox
+Far  :fpp-remote:
+Near :fpp-local:
+Patterns "INBOX"
+
+Channel fpp/archive
+Far  :fpp-remote:"[Gmail]/All Mail"
+Near :fpp-local:"archive"
+
+Channel fpp/drafts
+Far  :fpp-remote:"[Gmail]/Drafts"
+Near :fpp-local:"drafts"
+
+Channel fpp/sent
+Far  :fpp-remote:"[Gmail]/Sent Mail"
+Near :fpp-local:"sent"
+
+Channel fpp/spam
+Far  :fpp-remote:"[Gmail]/Spam"
+Near :fpp-local:"spam"
+
+Channel fpp/flagged
+Far  :fpp-remote:"[Gmail]/Starred"
+Near :fpp-local:"flagged"
+
+Channel fpp/bin
+Far  :fpp-remote:"[Gmail]/Trash"
+Near :fpp-local:"bin"
+
+Group fpp
+Channel fpp/inbox
+Channel fpp/archive
+Channel fpp/drafts
+Channel fpp/sent
+Channel fpp/spam
+Channel fpp/flagged
+Channel fpp/bin

diff --git a/msmtprc b/msmtprc
index 0147825562cfede8216d307b5cea53fe48f95868..1a9d24d542c7692f5d35468794cbb7b50c221a1a 100644 (file)
--- a/msmtprc
+++ b/msmtprc
@@ -16,15 +16,15 @@ user         samirbenmendil
 passwordeval "pass mailfence.com/smtp"
 from         me@rmz.io
 
-# witekio
-account wio
-host smtp.office365.com
+# fpp
+account fpp
+host smtp.gmail.com
 port 587
 protocol smtp
-auth xoauth2
-user sbenmendil@witekio.com
-passwordeval "~/.config/mutt/mutt_oauth2.py ~/.cache/mutt_oauth2/sbenmendil@witekio.com.tokens"
-from sbenmendil@witekio.com
+auth on
+user samir@fppnt.com
+passwordeval "~/.config/mutt/mutt_oauth2.py ~/.cache/mutt_oauth2/samir@fppnt.com.tokens"
+from samir@fppnt.com
 
 #set default account
 account default : mailfence

diff --git a/mutt/accounts/fpp b/mutt/accounts/fpp
new file mode 100644 (file)
index 0000000..d1b1114
--- /dev/null
+++ b/mutt/accounts/fpp
@@ -0,0 +1,24 @@
+# vim: ft=muttrc
+set realname = "Samir Benmendil"
+set from = "samir@fppnt.com"
+my_hdr Bcc: samir@fppnt.com
+set sendmail = "msmtp -a fpp"
+
+set spoolfile    = "+fpp/inbox"   # set inbox
+set postponed    = "+fpp/drafts"  # drafts folder
+unset record                      # do not move sent msgs to a folder, gmail does that
+unset move                        # do not move read msgs, gmail does that
+
+# goobook
+set query_command = "goobook query '%s'"
+
+mailboxes "+fpp/inbox"
+mailboxes "+fpp/sent"
+mailboxes "+fpp/archive"
+mailboxes "+fpp/drafts"
+mailboxes "+fpp/spam"
+mailboxes "+fpp/bin"
+
+macro index,pager gi "<change-folder>=fpp/inbox<return>"   "go to inbox"
+macro index,pager ga "<change-folder>=fpp/archive<return>" "go to archive"
+macro index,pager gs "<change-folder>=fpp/spam<return>"    "go to spam"

diff --git a/mutt/accounts/wio b/mutt/accounts/wio
deleted file mode 100644 (file)
index bc035c1..0000000
--- a/mutt/accounts/wio
+++ /dev/null
@@ -1,28 +0,0 @@
-# vim: ft=muttrc
-set realname = "Samir Benmendil"
-set from = "sbenmendil@witekio.com"
-my_hdr Bcc: sbenmendil@witekio.com
-set sendmail = "msmtp -a wio"
-
-set spoolfile = "+wio/inbox"   # set inbox
-set postponed = "+wio/drafts"  # drafts folder
-set record    = "+wio/sent"    # fcc sent message into folder
-set trash     = "+wio/bin"     # deleted messages go here
-set mbox      = "+wio/archive"
-unset move                          # do not move read msgs, we archive them after 3 months
-
-# goobook
-set query_command = "goobook query '%s'"
-
-mailboxes +wio/inbox
-mailboxes +wio/sent
-mailboxes +wio/archive
-mailboxes +wio/drafts
-mailboxes +wio/spam
-mailboxes +wio/bin
-
-set signature=$my_config_dir/accounts/wio.sig
-
-macro index,pager gi "<change-folder>+wio/inbox<return>"   "go to inbox"
-macro index,pager ga "<change-folder>+wio/archive<return>" "go to archive"
-macro index,pager gs "<change-folder>+wio/spam<return>"    "go to spam"

diff --git a/mutt/bindings b/mutt/bindings
index d71621c3860163b135d38fe3c132108d921b1249..469977b1e694b57d827db66071bf0c25ac07b557 100644 (file)
--- a/mutt/bindings
+++ b/mutt/bindings
@@ -50,4 +50,4 @@ bind index <space> collapse-thread
 bind attach <return>    view-mailcap
 
 macro index,pager <f2> '<sync-mailbox><enter-command>source $my_config_dir/accounts/mailfence<enter><change-folder>!<enter>'
-macro index,pager <f3> '<sync-mailbox><enter-command>source $my_config_dir/accounts/wio<enter><change-folder>!<enter>'
+macro index,pager <f3> '<sync-mailbox><enter-command>source $my_config_dir/accounts/fpp<enter><change-folder>!<enter>'

diff --git a/mutt/hooks b/mutt/hooks
index eae5df6ea4b7a0fa640fde9e2846b4cc1062d1fb..95212d6d2115f88cbd0deb792924fdbdef375a45 100644 (file)
--- a/mutt/hooks
+++ b/mutt/hooks
@@ -1,14 +1,13 @@
 # vim: ft=muttrc
 folder-hook =mailfence     source $my_config_dir/accounts/mailfence
 folder-hook =fpp           source $my_config_dir/accounts/fpp
-folder-hook =wio           source $my_config_dir/accounts/wio
 
 # fetch mail
 # by default sync all channels
 folder-hook .*                  setenv MBSYNC_CHANNEL -a
 folder-hook =mailfence/inbox$   setenv MBSYNC_CHANNEL mailfence/inbox
 folder-hook =mailfence/spam$    setenv MBSYNC_CHANNEL mailfence/spam
-folder-hook =wio/inbox$         setenv MBSYNC_CHANNEL wio/inbox
+folder-hook =fpp/inbox$         setenv MBSYNC_CHANNEL fpp/inbox
 macro index \Cl "\
 <shell-escape>mbsync -c $XDG_CONFIG_HOME/mbsync/config $MBSYNC_CHANNEL<enter>\
 <sync-mailbox><refresh>" \

diff --git a/mutt/muttrc.fpp b/mutt/muttrc.fpp
new file mode 100644 (file)
index 0000000..8e4d493
--- /dev/null
+++ b/mutt/muttrc.fpp
@@ -0,0 +1,2 @@
+source $XDG_CONFIG_HOME/mutt/muttrc
+source accounts/fpp  # source default account

diff --git a/mutt/muttrc.wio b/mutt/muttrc.wio
deleted file mode 100644 (file)
index 389e166..0000000
--- a/mutt/muttrc.wio
+++ /dev/null
@@ -1,2 +0,0 @@
-source $XDG_CONFIG_HOME/mutt/muttrc
-source accounts/wio  # source default account