email: remove gmail and office365 accounts

diff --git a/bin/office365-book b/bin/old/office365-book
similarity index 100%
rename from bin/office365-book
rename to bin/old/office365-book

diff --git a/mbsync/config b/mbsync/config
index 566249cbbc813a1a5764085b6f0e08ec0b869ad9..bd74cf6f2b2a9b8cd33a43969fb57b270052f2a6 100644 (file)
--- a/mbsync/config
+++ b/mbsync/config
@@ -61,81 +61,6 @@ Channel mailfence/bin
 Channel mailfence/youtube
 Channel mailfence/archive
 
 Channel mailfence/youtube
 Channel mailfence/archive
 

-IMAPAccount     gmail
-Host            imap.gmail.com
-User            samir.benmendil@gmail.com
-PassCmd         "sed -En '/imap.gmail.com.*samir.benmendil@gmail.com/ s/.*password (.*)/\\1/p' ~/.netrc"
-AuthMechs       LOGIN
-SSLType         IMAPS
-SSLVersion      SSLv3
-CertificateFile /etc/ssl/certs/ca-certificates.crt
-
-IMAPStore gmail-remote
-Account gmail
-
-MaildirStore gmail-local
-Path         ~/mail/gmail/
-Inbox        ~/mail/gmail/inbox/
-SubFolders   Verbatim
-
-Channel gmail-default
-Master  :gmail-remote:
-Slave   :gmail-local:
-Patterns "INBOX"
-
-Channel gmail-youtube
-Master  :gmail-remote:
-Slave   :gmail-local:
-Patterns "youtube"
-
-Channel gmail-youtube-watch.later
-Master  :gmail-remote:
-Slave   :gmail-local:
-Patterns "youtube-watch.later"
-
-Channel gmail-youtube-orig
-Master  :gmail-remote:
-Slave   :gmail-local:
-Patterns "youtube-orig"
-
-Channel gmail-archive
-Master :gmail-remote:"[Google Mail]/All Mail"
-Slave :gmail-local:"archive"
-
-Channel gmail-drafts
-Master :gmail-remote:"[Google Mail]/Drafts"
-Slave :gmail-local:"drafts"
-
-Channel gmail-sent
-Master :gmail-remote:"[Google Mail]/Sent Mail"
-Slave :gmail-local:"sent"
-
-Channel gmail-spam
-Master :gmail-remote:"[Google Mail]/Spam"
-Slave :gmail-local:"spam"
-
-Channel gmail-flagged
-Master :gmail-remote:"[Google Mail]/Starred"
-Slave :gmail-local:"flagged"
-
-Channel gmail-bin
-Master :gmail-remote:"[Google Mail]/Bin"
-Slave :gmail-local:"bin"
-
-Group gmail
-Channel gmail-default
-Channel gmail-drafts
-Channel gmail-sent
-Channel gmail-spam
-Channel gmail-flagged
-Channel gmail-bin
-
-Group gmail-more
-Channel gmail-youtube
-Channel gmail-youtube-watch.later
-Channel gmail-youtube-orig
-Channel gmail-archive
-

 IMAPAccount     fpp
 Host            imap.gmail.com
 User            samir@fppnt.com
 IMAPAccount     fpp
 Host            imap.gmail.com
 User            samir@fppnt.com

diff --git a/msmtprc b/msmtprc
index bbbba353c666f3a17e6412379d8f72408d2b8a95..43a61f1875ccb2f43d10b8df2d6d55d18afa5a75 100644 (file)
--- a/msmtprc
+++ b/msmtprc
@@ -16,16 +16,6 @@ user         samirbenmendil
 passwordeval "pass mailfence.com/smtp"
 from         me@rmz.io
 
 passwordeval "pass mailfence.com/smtp"
 from         me@rmz.io
 

-# gmail
-account gmail
-host smtp.gmail.com
-port 587
-protocol smtp
-auth on
-user samir.benmendil@gmail.com
-passwordeval "pass gmail.com/msmtp"
-from samir.benmendil@gmail.com
-

 # fpp
 account fpp
 host smtp.gmail.com
 # fpp
 account fpp
 host smtp.gmail.com


@@ -36,14 +26,5 @@ user samir@fppnt.com
 # passwordeval "pass gmail.com/msmtp"
 from samir@fppnt.com
 
 # passwordeval "pass gmail.com/msmtp"
 from samir@fppnt.com
 

-# office365
-account office365
-host smtp.office365.com
-port 587
-protocol smtp
-auth on
-user samir.benmendil@ultrahaptics.com
-passwordeval "pass ultrahaptics/okta.com/samir.benmendil@ultrahaptics.com"
-

 #set default account
 account default : mailfence
 #set default account
 account default : mailfence

diff --git a/mutt/accounts/chakra b/mutt/accounts/chakra
deleted file mode 100644 (file)
index caa05d4..0000000
--- a/mutt/accounts/chakra
+++ /dev/null
@@ -1,4 +0,0 @@
-# vim: ft=muttrc
-source gmail
-set realname = "Ram-Z"
-set from = "ram-z@chakralinux.org"

diff --git a/mutt/accounts/gmail b/mutt/accounts/gmail
deleted file mode 100644 (file)
index 468347c..0000000
--- a/mutt/accounts/gmail
+++ /dev/null
@@ -1,26 +0,0 @@
-# vim: ft=muttrc
-set realname = "Samir Benmendil"
-set from = "samir.benmendil@gmail.com"
-my_hdr Bcc: samir.benmendil@gmail.com
-set sendmail = "msmtp -a gmail"
-
-set spoolfile    = "+gmail/inbox"   # set inbox
-set postponed    = "+gmail/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 "+gmail/inbox"
-mailboxes "+gmail/sent"
-mailboxes "+gmail/youtube"
-mailboxes "+gmail/archive"
-mailboxes "+gmail/drafts"
-mailboxes "+gmail/spam"
-mailboxes "+gmail/bin"
-
-macro index,pager gi "<change-folder>=gmail/inbox<return>"   "go to inbox"
-macro index,pager gy "<change-folder>=gmail/youtube<return>" "go to youtube"
-macro index,pager ga "<change-folder>=gmail/archive<return>" "go to archive"
-macro index,pager gs "<change-folder>=gmail/spam<return>"    "go to spam"

diff --git a/mutt/accounts/office365 b/mutt/accounts/office365
deleted file mode 100644 (file)
index 23ad796..0000000
--- a/mutt/accounts/office365
+++ /dev/null
@@ -1,24 +0,0 @@
-# vim: ft=muttrc
-set realname = "Samir Benmendil"
-set from = "samir.benmendil@ultrahaptics.com"
-my_hdr Bcc: samir.benmendil@ultrahaptics.com
-set sendmail = "msmtp -a office365"
-
-set spoolfile    = "+office365/inbox"   # set inbox
-set postponed    = "+office365/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
-
-# office365
-set query_command = "office365-book"
-
-mailboxes "+office365/inbox"
-mailboxes "+office365/sent"
-mailboxes "+office365/archive"
-mailboxes "+office365/drafts"
-mailboxes "+office365/spam"
-mailboxes "+office365/bin"
-
-macro index,pager gi "<change-folder>=office365/inbox<return>"   "go to inbox"
-macro index,pager ga "<change-folder>=office365/archive<return>" "go to archive"
-macro index,pager gs "<change-folder>=office365/spam<return>"    "go to spam"

diff --git a/mutt/bindings b/mutt/bindings
index 18150275a2445d5532d117cfa3babf6d6327dbf5..ec828d2a1e4190e569518026cf193e760d86cbc8 100644 (file)
--- a/mutt/bindings
+++ b/mutt/bindings
@@ -54,4 +54,3 @@ macro index,pager a "<pipe-message>goobook add<return>" "add the sender address
 
 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/fpp<enter><change-folder>!<enter>'
 
 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/fpp<enter><change-folder>!<enter>'

-macro index,pager <f4> '<sync-mailbox><enter-command>source $my_config_dir/accounts/gmail<enter><change-folder>!<enter>'

diff --git a/mutt/hooks b/mutt/hooks
index 8f084b60c4f9c598a325bc98bec509f4e0764e9b..be9b5a7bafc66a25f38227d531088a5a7bad12a8 100644 (file)
--- a/mutt/hooks
+++ b/mutt/hooks
@@ -1,9 +1,6 @@
 # vim: ft=muttrc
 folder-hook mailfence     source $my_config_dir/accounts/mailfence
 # vim: ft=muttrc
 folder-hook mailfence     source $my_config_dir/accounts/mailfence

-folder-hook gmail         source $my_config_dir/accounts/gmail
-folder-hook gmail/chakra  source $my_config_dir/accounts/chakra
-
-folder-hook fpp     source $my_config_dir/accounts/fpp
+folder-hook fpp           source $my_config_dir/accounts/fpp

 
 folder-hook .* "exec collapse-all"
 
 
 folder-hook .* "exec collapse-all"
 


@@ -13,9 +10,9 @@ folder-hook inbox push '<limit>=(=U|=F)<enter>'
 folder-hook mailfence/inbox push '<tag-pattern>!~(~U|~F|~d<3m)<enter><tag-prefix-cond><save-message>=mailfence/archive<enter><end-cond>'
 
 # limit youtube to Unread and Flagged mails
 folder-hook mailfence/inbox push '<tag-pattern>!~(~U|~F|~d<3m)<enter><tag-prefix-cond><save-message>=mailfence/archive<enter><end-cond>'
 
 # limit youtube to Unread and Flagged mails

-folder-hook gmail/youtube push '<limit>=(=U|=F)<enter>'
+folder-hook mailfence/youtube push '<limit>=(=U|=F)<enter>'

 # delete other mails
 # delete other mails

-folder-hook gmail/youtube push '<delete-pattern>!~(~U|~F)<enter>'
+folder-hook mailfence/youtube push '<delete-pattern>!~(~U|~F)<enter>'

 
 # open video in mpv
 set my_pipe_decode=$pipe_decode
 
 # open video in mpv
 set my_pipe_decode=$pipe_decode