update

5 files changed, 49 insertions, 43 deletions

diff --git a/.config/mutt/accounts/1-bousset.rudy@gmail.com.muttrc b/.config/mutt/accounts/1-bousset.rudy@gmail.com.muttrc
index 3e6e51b..1023d75 100644
--- a/.config/mutt/accounts/1-bousset.rudy@gmail.com.muttrc
+++ b/.config/mutt/accounts/1-bousset.rudy@gmail.com.muttrc
@@ -17,7 +17,7 @@ bind index gg first-entry
 macro index o "<shell-escape>mbsync -c /usr/home/jozan/.config/mbsync/mbsyncrc bousset.rudy@gmail.com<enter>" "run mbsync to sync bousset.rudy@gmail.com"
 unmailboxes *
 
-mailboxes "=INBOX" "=[Gmail]/Sent Mail" "=[Gmail]/Drafts" "=[Gmail]/Spam" "=[Gmail]/Trash" "=Saved"
+mailboxes "=INBOX" "=[Gmail]/Sent Mail" "=[Gmail]/Drafts" "=[Gmail]/Spam" "=[Gmail]/Trash"
 
 macro index,pager gi "<change-folder>=INBOX<enter>" "go to inbox" # mw-autogenerated
 macro index,pager Mi ";<save-message>=INBOX<enter>" "move mail to inbox" # mw-autogenerated
diff --git a/.config/mutt/accounts/2-olsen.oyvind.nor@gmail.com.muttrc b/.config/mutt/accounts/2-olsen.oyvind.nor@gmail.com.muttrc
index 8986290..79e986a 100644
--- a/.config/mutt/accounts/2-olsen.oyvind.nor@gmail.com.muttrc
+++ b/.config/mutt/accounts/2-olsen.oyvind.nor@gmail.com.muttrc
@@ -17,7 +17,7 @@ bind index gg first-entry
 macro index o "<shell-escape>mbsync -c /usr/home/jozan/.config/mbsync/mbsyncrc olsen.oyvind.nor@gmail.com<enter>" "run mbsync to sync olsen.oyvind.nor@gmail.com"
 unmailboxes *
 
-mailboxes "=INBOX" "=[Gmail]/Sent Mail" "=[Gmail]/Drafts" "=[Gmail]/Spam" "=[Gmail]/Trash" "=Save"
+mailboxes "=INBOX" "=[Gmail]/Sent Mail" "=[Gmail]/Drafts" "=[Gmail]/Spam" "=[Gmail]/Trash"
 
 macro index,pager gi "<change-folder>=INBOX<enter>" "go to inbox" # mw-autogenerated
 macro index,pager Mi ";<save-message>=INBOX<enter>" "move mail to inbox" # mw-autogenerated
diff --git a/.config/mutt/accounts/5-rbousset@secuserve.com.muttrc b/.config/mutt/accounts/5-rbousset@secuserve.com.muttrc
index 94260c7..fc0c9cb 100644
--- a/.config/mutt/accounts/5-rbousset@secuserve.com.muttrc
+++ b/.config/mutt/accounts/5-rbousset@secuserve.com.muttrc
@@ -35,6 +35,6 @@ macro index,pager gt "<change-folder>=Trash<enter>" "go to trash" # mw-autogener
 macro index,pager Mt ";<save-message>=Trash<enter>" "move mail to trash" # mw-autogenerated
 macro index,pager Ct ";<copy-message>=Trash<enter>" "copy mail to trash" # mw-autogenerated
 set trash = "+Trash" # mw-autogenerated
-macro index,pager gn "<change-folder>=NEWS<enter>" "go to sent" # mw-autogenerated
-macro index,pager Mn ";<save-message>=NEWS<enter>" "move mail to sent" # mw-autogenerated
-macro index,pager Cn ";<copy-message>=NEWS<enter>" "copy mail to sent" # mw-autogenerated
+macro index,pager gn "<change-folder>=NEWS<enter>" "go to news" # mw-autogenerated
+macro index,pager Mn ";<save-message>=NEWS<enter>" "move mail to news" # mw-autogenerated
+macro index,pager Cn ";<copy-message>=NEWS<enter>" "copy mail to news" # mw-autogenerated
diff --git a/.config/mutt/accounts/6-exploitation@secuserve.com.muttrc b/.config/mutt/accounts/6-exploitation@secuserve.com.muttrc
index 75d6d5c..1b48ab1 100644
--- a/.config/mutt/accounts/6-exploitation@secuserve.com.muttrc
+++ b/.config/mutt/accounts/6-exploitation@secuserve.com.muttrc
@@ -18,46 +18,49 @@ macro index o "<shell-escape>mbsync -c /usr/home/jozan/.config/mbsync/mbsyncrc e
 unmailboxes *
 
 mailboxes "=INBOX" "=INBOX/- Secuserve" "=INBOX/Altospam" "=INBOX/BAT" "=INBOX/DEBUG" "=INBOX/Erreurs (boite recept)" \
-"=INBOX/Erreurs (boite recept)/Erreur SI local" "=INBOX/Erreurs (boite recept)/Erreur diverses" "=INBOX/Erreurs (boite recept)/Erreur transport" "=INBOX/Notification" "=INBOX/Postfix SMTP server errors" "=INBOX/Spamtiometre" \
-"=INBOX/TSRC sync" "=INBOX/Trait&AOk-" "=INBOX/replication" "=&AMk-l&AOk-ments envoy&AOk-s" "=&AMk-l&AOk-ments supprim&AOk-s" "=Alert FireWall" \
-"=Alert-Monitoring" "=Archive" "=Archives" "=Archives/2009" "=Archives/2010" "=Archives/2011" \
-"=Archives/2012" "=Archives/2013" "=Archives/2014" "=Archives/2015" "=Archives/2016" "=Archives/2017" \
-"=Archives/2022" "=Backups" "=Brouillons" "=Calendrier" "=Calendrier/Astreintes" "=Calendrier/Conges" \
-"=Complaints" "=Complaints/Complaint La Poste" "=Complaints/Complaint Outlook et Hotmail" "=Contacts" "=Contacts/Clients" "=Courrier ind&AOk-sirable" \
-"=Courrier ind&AOk-sirable/SPAM by St&AOk-phane &- Peggy" "=DNS" "=DNS/DNS - MX Status" "=DNS/MxToolBox" "=DNS/Report domain" "=DNS/Report domain/Report domain - Google" \
-"=DNS/Report domain/Report domain - Yahoo" "=Drafts" "=Erreurs" "=Fournisseurs" "=Fournisseurs/Applications" "=Fournisseurs/Applications/Communigate" \
-"=Fournisseurs/Cisco" "=Fournisseurs/DigiCert" "=Fournisseurs/Gandi" "=Fournisseurs/Hebergement" "=Fournisseurs/Hebergement/Global SP" "=Fournisseurs/Hebergement/OVH" \
-"=Fournisseurs/Hebergement/OVH/OVH - Message vocaux" "=Fournisseurs/Hebergement/Online" "=Fournisseurs/Hebergement/Owentis" "=Fournisseurs/Hebergement/Owentis/Equinix" "=Fournisseurs/Hebergement/Owentis/Global Switch" "=Incident" \
-"=Info Exploitation" "=Info Exploitation/Autre-Licence" "=Info Exploitation/Certificat" "=Info Exploitation/History" "=Info Exploitation/Licence-Antivirus" "=Info Exploitation/Maintenance Datacenter" \
-"=Info Exploitation/Pkg-Information" "=Info Exploitation/RBLS" "=Info Exploitation/Support-Technique-Interne" "=Interventions" "=Journal" "=Junk" \
-"=MEP" "=MEP/Attente retour Dev" "=MEP/Done" "=MEP/En-cours" "=MEP/wblist" "=Notes" \
-"=Report domain/Report domain - Google" "=Report domain/Report domain - Yahoo" "=SPAM" "=SPAM/SPAMS_NONTRAITES" "=SPAM/SPAMS_TRAITES" "=SPAM/SPAM_TRAP" \
-"=SVN" "=Sent" "=Statistiques" "=Statistiques/Stats clients" "=Statistiques/Stats fournisseurs" "=Supervision" \
-"=Supervision/Alarme Lyon" "=Supervision/Alert-Monitoring" "=Supervision/Alerte-Nagios" "=Supervision/Zabbix" "=T&AOI-ches" "=Trash" \
-"=Trash/DOC-SUPPORT" "=Trash/Deleted Messages" "=Trash/Depassement de quota" "=Trash/ESET Antispam" "=Trash/GIP-RENATER" "=Trash/MIGRATION-CLIENT" \
-"=Trash/MIGRATION-CLIENT/Cahors" "=Trash/Messages journaliers" "=Trash/Messages journaliers/configs" "=Trash/Messages journaliers/quarantaine" "=Trash/Messages journaliers/rapport quarantaine journalier" "=Trash/PUB" \
-"=Trash/Rapport-Astreintes" "=Trash/Reseaux" "=Trash/Stalker" "=Trash/Technique" "=Trash/procedures" "=main courante" \
-"=main courante/Done"
- 
+		  "=INBOX/Erreurs (boite recept)/Erreur SI local" "=INBOX/Erreurs (boite recept)/Erreur diverses" "=INBOX/Erreurs (boite recept)/Erreur transport" "=INBOX/Notification" "=INBOX/Postfix SMTP server errors" "=INBOX/Spamtiometre" \
+		  "=INBOX/TSRC sync" "=INBOX/Trait&AOk-" "=INBOX/replication" \
+		  "=&AMk-l&AOk-ments envoy&AOk-s" "=Drafts" "=SPAM" "=SPAM/SPAMS_NONTRAITES" "=SPAM/SPAMS_TRAITES" "=SPAM/SPAM_TRAP" \
+		  "=Trash" "=Trash/DOC-SUPPORT" "=Trash/Deleted Messages" "=Trash/Depassement de quota" "=Trash/ESET Antispam" \
+		  "=Trash/GIP-RENATER" "=Trash/MIGRATION-CLIENT" "=Trash/MIGRATION-CLIENT/Cahors" "=Trash/Messages journaliers" "=Trash/Messages journaliers/configs" "=Trash/Messages journaliers/quarantaine" "=Trash/Messages journaliers/rapport quarantaine journalier" "=Trash/PUB" \
+		  "=Trash/Rapport-Astreintes" "=Trash/Reseaux" "=Trash/Stalker" "=Trash/Technique" "=Trash/procedures" \
+		  "=Sent" "=Brouillons" "=Calendrier" "=Calendrier/Astreintes" "=Calendrier/Conges" \
+		  "=&AMk-l&AOk-ments supprim&AOk-s" "=Alert FireWall" \
+		  "=Alert-Monitoring" "=Archive" "=Archives" "=Archives/2009" "=Archives/2010" "=Archives/2011" \
+		  "=Archives/2012" "=Archives/2013" "=Archives/2014" "=Archives/2015" "=Archives/2016" "=Archives/2017" \
+		  "=Archives/2022" "=Backups" \
+		  "=Complaints" "=Complaints/Complaint La Poste" "=Complaints/Complaint Outlook et Hotmail" "=Contacts" "=Contacts/Clients" "=Courrier ind&AOk-sirable" \
+		  "=Courrier ind&AOk-sirable/SPAM by St&AOk-phane &- Peggy" "=DNS" "=DNS/DNS - MX Status" "=DNS/MxToolBox" "=DNS/Report domain" "=DNS/Report domain/Report domain - Google" \
+		  "=DNS/Report domain/Report domain - Yahoo" "=Erreurs" "=Fournisseurs" "=Fournisseurs/Applications" "=Fournisseurs/Applications/Communigate" \
+		  "=Fournisseurs/Cisco" "=Fournisseurs/DigiCert" "=Fournisseurs/Gandi" "=Fournisseurs/Hebergement" "=Fournisseurs/Hebergement/Global SP" "=Fournisseurs/Hebergement/OVH" \
+		  "=Fournisseurs/Hebergement/OVH/OVH - Message vocaux" "=Fournisseurs/Hebergement/Online" "=Fournisseurs/Hebergement/Owentis" "=Fournisseurs/Hebergement/Owentis/Equinix" "=Fournisseurs/Hebergement/Owentis/Global Switch" "=Incident" \
+		  "=Info Exploitation" "=Info Exploitation/Autre-Licence" "=Info Exploitation/Certificat" "=Info Exploitation/History" "=Info Exploitation/Licence-Antivirus" "=Info Exploitation/Maintenance Datacenter" \
+		  "=Info Exploitation/Pkg-Information" "=Info Exploitation/RBLS" "=Info Exploitation/Support-Technique-Interne" "=Interventions" "=Journal" "=Junk" \
+		  "=MEP" "=MEP/Attente retour Dev" "=MEP/Done" "=MEP/En-cours" "=MEP/wblist" "=Notes" \
+		  "=Report domain/Report domain - Google" "=Report domain/Report domain - Yahoo" \
+		  "=SVN" "=Statistiques" "=Statistiques/Stats clients" "=Statistiques/Stats fournisseurs" "=Supervision" \
+		  "=Supervision/Alarme Lyon" "=Supervision/Alert-Monitoring" "=Supervision/Alerte-Nagios" "=Supervision/Zabbix" "=T&AOI-ches" \
+		  "=main courante" "=main courante/Done"
+
 macro index,pager gi "<change-folder>=INBOX<enter>" "go to inbox" # mw-autogenerated
 macro index,pager Mi ";<save-message>=INBOX<enter>" "move mail to inbox" # mw-autogenerated
 macro index,pager Ci ";<copy-message>=INBOX<enter>" "copy mail to inbox" # mw-autogenerated
 set spoolfile = "+INBOX" # mw-autogenerated
-set postponed = "+Drafts" # mw-autogenerated
-macro index,pager gd "<change-folder>=Drafts<enter>" "go to drafts" # mw-autogenerated
-macro index,pager Md ";<save-message>=Drafts<enter>" "move mail to drafts" # mw-autogenerated
-macro index,pager Cd ";<copy-message>=Drafts<enter>" "copy mail to drafts" # mw-autogenerated
-set record = "+&AMk-l&AOk-ments envoy&AOk-s" # mw-autogenerated
 macro index,pager gs "<change-folder>=&AMk-l&AOk-ments envoy&AOk-s<enter>" "go to sent" # mw-autogenerated
 macro index,pager Ms ";<save-message>=&AMk-l&AOk-ments envoy&AOk-s<enter>" "move mail to sent" # mw-autogenerated
 macro index,pager Cs ";<copy-message>=&AMk-l&AOk-ments envoy&AOk-s<enter>" "copy mail to sent" # mw-autogenerated
-macro index,pager gS "<change-folder>=SPAM<enter>" "go to sent" # mw-autogenerated
-macro index,pager MS ";<save-message>=SPAM<enter>" "move mail to sent" # mw-autogenerated
-macro index,pager CS ";<copy-message>=SPAM<enter>" "copy mail to sent" # mw-autogenerated
+set record = "+&AMk-l&AOk-ments envoy&AOk-s" # mw-autogenerated
+macro index,pager gd "<change-folder>=Drafts<enter>" "go to drafts" # mw-autogenerated
+macro index,pager Md ";<save-message>=Drafts<enter>" "move mail to drafts" # mw-autogenerated
+macro index,pager Cd ";<copy-message>=Drafts<enter>" "copy mail to drafts" # mw-autogenerated
+set postponed = "+Drafts" # mw-autogenerated
+macro index,pager gS "<change-folder>=SPAM<enter>" "go to spam" # mw-autogenerated
+macro index,pager MS ";<save-message>=SPAM<enter>" "move mail to spam" # mw-autogenerated
+macro index,pager CS ";<copy-message>=SPAM<enter>" "copy mail to spam" # mw-autogenerated
 macro index,pager gt "<change-folder>=Trash<enter>" "go to trash" # mw-autogenerated
 macro index,pager Mt ";<save-message>=Trash<enter>" "move mail to trash" # mw-autogenerated
 macro index,pager Ct ";<copy-message>=Trash<enter>" "copy mail to trash" # mw-autogenerated
-macro index,pager gn "<change-folder>=NEWS<enter>" "go to sent" # mw-autogenerated
-macro index,pager Mn ";<save-message>=NEWS<enter>" "move mail to sent" # mw-autogenerated
-macro index,pager Cn ";<copy-message>=NEWS<enter>" "copy mail to sent" # mw-autogenerated
 set trash = "+Trash" # mw-autogenerated
+macro index,pager gc "<change-folder>=Calendrier<enter>" "go to calendar" # mw-autogenerated
+macro index,pager Mc ";<save-message>=Calendrier<enter>" "move mail to calendar" # mw-autogenerated
+macro index,pager Cc ";<copy-message>=Calendrier<enter>" "copy mail to calendar" # mw-autogenerated
diff --git a/.config/mutt/accounts/7-support@secuserve.com.muttrc b/.config/mutt/accounts/7-support@secuserve.com.muttrc
index 8e2564c..5e59b01 100644
--- a/.config/mutt/accounts/7-support@secuserve.com.muttrc
+++ b/.config/mutt/accounts/7-support@secuserve.com.muttrc
@@ -67,13 +67,16 @@ macro index,pager gd "<change-folder>=Drafts<enter>" "go to drafts" # mw-autogen
 macro index,pager Md ";<save-message>=Drafts<enter>" "move mail to drafts" # mw-autogenerated
 macro index,pager Cd ";<copy-message>=Drafts<enter>" "copy mail to drafts" # mw-autogenerated
 set postponed = "+Drafts" # mw-autogenerated
-macro index,pager gS "<change-folder>=SPAM<enter>" "go to sent" # mw-autogenerated
-macro index,pager MS ";<save-message>=SPAM<enter>" "move mail to sent" # mw-autogenerated
-macro index,pager CS ";<copy-message>=SPAM<enter>" "copy mail to sent" # mw-autogenerated
+macro index,pager gS "<change-folder>=SPAM<enter>" "go to spam" # mw-autogenerated
+macro index,pager MS ";<save-message>=SPAM<enter>" "move mail to spam" # mw-autogenerated
+macro index,pager CS ";<copy-message>=SPAM<enter>" "copy mail to spam" # mw-autogenerated
 macro index,pager gt "<change-folder>=Trash<enter>" "go to trash" # mw-autogenerated
 macro index,pager Mt ";<save-message>=Trash<enter>" "move mail to trash" # mw-autogenerated
 macro index,pager Ct ";<copy-message>=Trash<enter>" "copy mail to trash" # mw-autogenerated
 set trash = "+Trash" # mw-autogenerated
-macro index,pager gn "<change-folder>=NEWS<enter>" "go to sent" # mw-autogenerated
-macro index,pager Mn ";<save-message>=NEWS<enter>" "move mail to sent" # mw-autogenerated
-macro index,pager Cn ";<copy-message>=NEWS<enter>" "copy mail to sent" # mw-autogenerated
+macro index,pager gn "<change-folder>=NEWS<enter>" "go to news" # mw-autogenerated
+macro index,pager Mn ";<save-message>=NEWS<enter>" "move mail to news" # mw-autogenerated
+macro index,pager Cn ";<copy-message>=NEWS<enter>" "copy mail to news" # mw-autogenerated
+macro index,pager gc "<change-folder>=Calendrier<enter>" "go to calendar" # mw-autogenerated
+macro index,pager Mc ";<save-message>=Calendrier<enter>" "move mail to calendar" # mw-autogenerated
+macro index,pager Cc ";<copy-message>=Calendrier<enter>" "copy mail to calendar" # mw-autogenerated