11 files changed, 182 insertions, 98 deletions
diff --git a/.config/mbsync/mbsyncrc b/.config/mbsync/mbsyncrc
index eeb6cb2..4d1fd28 100644
--- a/.config/mbsync/mbsyncrc
+++ b/.config/mbsync/mbsyncrc
@@ -1,5 +1,30 @@
 # vim filetype=conf
-IMAPStore bousset.rudy@gmail.com-remote
+IMAPStore main-remote
+Host 127.0.0.1
+Port 1143
+User rrbo@proton.me
+PassCmd "pass show mutt/rrbo@proton.me"
+# AuthMechs LOGIN
+SSLType None
+# CertificateFile /etc/ssl/cert.pem
+
+MaildirStore main-local
+SubFolders Verbatim
+Path /var/mail/jozan/main/
+Inbox /var/mail/jozan/main/INBOX
+
+Channel main
+Far :main-remote:
+Near :main-local:
+Patterns *
+Create Both
+Expunge Both
+SyncState *
+MaxMessages 0
+ExpireUnread no
+# End profile
+
+IMAPStore gmail_br-remote
 Host imap.gmail.com
 Port 993
 User bousset.rudy@gmail.com
@@ -8,15 +33,15 @@ AuthMechs LOGIN
 SSLType IMAPS
 CertificateFile /etc/ssl/cert.pem
 
-MaildirStore bousset.rudy@gmail.com-local
+MaildirStore gmail_br-local
 SubFolders Verbatim
-Path /var/mail/jozan/bousset.rudy@gmail.com/
-Inbox /var/mail/jozan/bousset.rudy@gmail.com/INBOX
+Path /var/mail/jozan/gmail_br/
+Inbox /var/mail/jozan/gmail_br/INBOX
 
-Channel bousset.rudy@gmail.com
+Channel gmail_br
 Expunge Both
-Far :bousset.rudy@gmail.com-remote:
-Near :bousset.rudy@gmail.com-local:
+Far :gmail_br-remote:
+Near :gmail_br-local:
 Patterns *
 Create Both
 SyncState *
@@ -24,7 +49,7 @@ MaxMessages 0
 ExpireUnread no
 # End profile
 
-IMAPStore olsen.oyvind.nor@gmail.com-remote
+IMAPStore gmail_oon-remote
 Host imap.gmail.com
 Port 993
 User olsen.oyvind.nor@gmail.com
@@ -33,15 +58,15 @@ AuthMechs LOGIN
 SSLType IMAPS
 CertificateFile /etc/ssl/cert.pem
 
-MaildirStore olsen.oyvind.nor@gmail.com-local
+MaildirStore gmail_oon-local
 SubFolders Verbatim
-Path /var/mail/jozan/olsen.oyvind.nor@gmail.com/
-Inbox /var/mail/jozan/olsen.oyvind.nor@gmail.com/INBOX
+Path /var/mail/jozan/gmail_oon/
+Inbox /var/mail/jozan/gmail_oon/INBOX
 
-Channel olsen.oyvind.nor@gmail.com
+Channel gmail_oon
 Expunge Both
-Far :olsen.oyvind.nor@gmail.com-remote:
-Near :olsen.oyvind.nor@gmail.com-local:
+Far :gmail_oon-remote:
+Near :gmail_oon-local:
 Patterns *
 Create Both
 SyncState *
@@ -49,7 +74,7 @@ MaxMessages 0
 ExpireUnread no
 # End profile
 
-# IMAPStore towerofsilence777@gmail.com-remote
+# IMAPStore gmail_tos-remote
 # Host imap.gmail.com
 # Port 993
 # User towerofsilence777@gmail.com
@@ -58,15 +83,15 @@ ExpireUnread no
 # SSLType IMAPS
 # CertificateFile /etc/ssl/cert.pem
 # 
-# MaildirStore towerofsilence777@gmail.com-local
+# MaildirStore gmail_tos-local
 # SubFolders Verbatim
-# Path /var/mail/jozan/towerofsilence777@gmail.com/
-# Inbox /var/mail/jozan/towerofsilence777@gmail.com/INBOX
+# Path /var/mail/jozan/gmail_tos/
+# Inbox /var/mail/jozan/gmail_tos/INBOX
 # 
-# Channel towerofsilence777@gmail.com
+# Channel gmail_tos
 # Expunge Both
-# Far :towerofsilence777@gmail.com-remote:
-# Near :towerofsilence777@gmail.com-local:
+# Far :gmail_tos-remote:
+# Near :gmail_tos-local:
 # Patterns *
 # Create Both
 # SyncState *
@@ -74,7 +99,7 @@ ExpireUnread no
 # ExpireUnread no
 # # End profile
 
-IMAPStore rbousset@secuserve.com-remote
+IMAPStore ss_perso-remote
 Host next.optimails.com
 Port 993
 User rbousset@secuserve.com
@@ -83,15 +108,15 @@ AuthMechs LOGIN
 SSLType IMAPS
 CertificateFile /etc/ssl/cert.pem
 
-MaildirStore rbousset@secuserve.com-local
+MaildirStore ss_perso-local
 SubFolders Verbatim
-Path /var/mail/jozan/rbousset@secuserve.com/
-Inbox /var/mail/jozan/rbousset@secuserve.com/INBOX
+Path /var/mail/jozan/ss_perso/
+Inbox /var/mail/jozan/ss_perso/INBOX
 
-Channel rbousset@secuserve.com
+Channel ss_perso
 Expunge Both
-Far :rbousset@secuserve.com-remote:
-Near :rbousset@secuserve.com-local:
+Far :ss_perso-remote:
+Near :ss_perso-local:
 Patterns *
 Create Both
 SyncState *
@@ -99,7 +124,7 @@ MaxMessages 0
 ExpireUnread no
 # End profile
 
-IMAPStore exploitation@secuserve.com-remote
+IMAPStore ss_exploit-remote
 Host next.optimails.com
 Port 993
 User exploitation@secuserve.com
@@ -108,15 +133,15 @@ AuthMechs LOGIN
 SSLType IMAPS
 CertificateFile /etc/ssl/cert.pem
 
-MaildirStore exploitation@secuserve.com-local
+MaildirStore ss_exploit-local
 SubFolders Verbatim
-Path /var/mail/jozan/exploitation@secuserve.com/
-Inbox /var/mail/jozan/exploitation@secuserve.com/INBOX
+Path /var/mail/jozan/ss_exploit/
+Inbox /var/mail/jozan/ss_exploit/INBOX
 
-Channel exploitation@secuserve.com
+Channel ss_exploit
 Expunge Both
-Far :exploitation@secuserve.com-remote:
-Near :exploitation@secuserve.com-local:
+Far :ss_exploit-remote:
+Near :ss_exploit-local:
 Patterns *
 Create Both
 SyncState *
@@ -124,7 +149,7 @@ MaxMessages 0
 ExpireUnread no
 # End profile
 
-IMAPStore support@secuserve.com-remote
+IMAPStore ss_support-remote
 Host next.optimails.com
 Port 993
 User support@secuserve.com
@@ -133,18 +158,18 @@ AuthMechs LOGIN
 SSLType IMAPS
 CertificateFile /etc/ssl/cert.pem
 
-MaildirStore support@secuserve.com-local
+MaildirStore ss_support-local
 SubFolders Verbatim
-Path /var/mail/jozan/support@secuserve.com/
-Inbox /var/mail/jozan/support@secuserve.com/INBOX
+Path /var/mail/jozan/ss_support/
+Inbox /var/mail/jozan/ss_support/INBOX
 
-Channel support@secuserve.com
+Channel ss_support
 Expunge Both
-Far :support@secuserve.com-remote:
-Near :support@secuserve.com-local:
+Far :ss_support-remote:
+Near :ss_support-local:
 Patterns *
 Create Both
 SyncState *
 MaxMessages 0
 ExpireUnread no
-# End profile
-\ No newline at end of file
+# End profile
diff --git a/.config/msmtp/config b/.config/msmtp/config
index 5d08b59..2317ef5 100644
--- a/.config/msmtp/config
+++ b/.config/msmtp/config
@@ -4,42 +4,49 @@ tls	on
 tls_trust_file	/etc/ssl/cert.pem
 logfile /home/jozan/.config/msmtp/msmtp.log
 
-account bousset.rudy@gmail.com
+account main
+  host 127.0.0.1
+  port 1025
+  from rrbo@proton.me
+  user rrbo@proton.me
+  passwordeval "pass show mutt/rrbo@proton.me"
+
+account gmail_br
   host smtp.gmail.com
   port 587
   from Rudy Bousset
   user bousset.rudy@gmail.com
   passwordeval "pass show mutt/bousset.rudy@gmail.com"
 
-account olsen.oyvind.nor@gmail.com
+account gmail_oon
   host smtp.gmail.com
   port 587
   from Joe
   user olsen.oyvind.nor@gmail.com
   passwordeval "pass show mutt/olsen.oyvind.nor@gmail.com"
 
-account towerofsilence777@gmail.com
-  host smtp.gmail.com
-  port 587
-  from Tower Of Silence
-  user towerofsilence777@gmail.com
-  passwordeval "pass show mutt/towerofsilence777@gmail.com"
+# account gmail_tos
+#   host smtp.gmail.com
+#   port 587
+#   from Tower Of Silence
+#   user towerofsilence777@gmail.com
+#   passwordeval "pass show mutt/towerofsilence777@gmail.com"
 
-account rbousset@secuserve.com
+account ss_perso
   host next.optimails.com
   port 587
   from rbousset@secuserve.com
   user rbousset@secuserve.com
   passwordeval "pass show mutt/rbousset@secuserve.com"
 
-account exploitation@secuserve.com
+account ss_exploit
   host next.optimails.com
   port 587
   from Team Exploitation SecuServe
   user exploitation@secuserve.com
   passwordeval "pass show mutt/exploitation@secuserve.com"
 
-account support@secuserve.com
+account ss_support
   host next.optimails.com
   port 587
   from support@secuserve.com
diff --git a/.config/mutt/accounts/1-main.muttrc b/.config/mutt/accounts/1-main.muttrc
new file mode 100644
index 0000000..a62092a
--- /dev/null
+++ b/.config/mutt/accounts/1-main.muttrc
@@ -0,0 +1,43 @@
+# vim: filetype=neomuttrc
+# muttrc file for account bousset.rudy@gmail.com
+set realname = "Rudy Bousset"
+set from = "rrbo@proton.me"
+set sendmail = "msmtp --tls-certcheck=off -a main"
+alias me Rudy Bousset <rrbo@proton.me>
+set folder = "$MAIL/main"
+set header_cache = $XDG_RUNTIME_DIR/mutt/main/headers
+set message_cachedir = $XDG_RUNTIME_DIR/mutt/main/bodies
+set mbox_type = Maildir
+set crypt_autosign = no
+
+bind index,pager gg noop
+bind index,pager g noop
+bind index,pager M noop
+bind index,pager C noop
+bind index gg first-entry
+bind pager gg top
+bind pager G bottom
+macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc main<enter>" "run mbsync to sync rrbo@proton.me"
+unmailboxes *
+
+mailboxes "=INBOX" "=Sent" "=Drafts" "=Spam" "=Trash" "=Archive" "=All Mail" "=Folders/Keep" "=Folders/Work"
+
+macro index,pager gi "<change-folder>=INBOX<enter>" "go to inbox"
+macro index,pager Mi ";<save-message>=INBOX<enter>" "move mail to inbox"
+macro index,pager Ci ";<copy-message>=INBOX<enter>" "copy mail to inbox"
+set spoolfile = "+INBOX"
+macro index,pager gs "<change-folder>=Sent<enter>" "go to sent"
+macro index,pager Ms ";<save-message>=Sent<enter>" "move mail to sent"
+macro index,pager Cs ";<copy-message>=Sent<enter>" "copy mail to sent"
+set record = "+Sent"
+macro index,pager gd "<change-folder>=Drafts<enter>" "go to drafts"
+macro index,pager Md ";<save-message>=Drafts<enter>" "move mail to drafts"
+macro index,pager Cd ";<copy-message>=Drafts<enter>" "copy mail to drafts"
+set postponed = "+Drafts"
+macro index,pager gS "<change-folder>=Spam<enter>" "go to spam"
+macro index,pager MS ";<save-message>=Spam<enter>" "move mail to spam"
+macro index,pager CS ";<copy-message>=Spam<enter>" "copy mail to spam"
+macro index,pager gt "<change-folder>=Trash<enter>" "go to trash"
+macro index,pager Mt ";<save-message>=Trash<enter>" "move mail to trash"
+macro index,pager Ct ";<copy-message>=Trash<enter>" "copy mail to trash"
+set trash = "+Trash"
diff --git a/.config/mutt/accounts/1-bousset.rudy@gmail.com.muttrc b/.config/mutt/accounts/2-gmail_br.muttrc
index c5e86dc..4c3b748 100644
--- a/.config/mutt/accounts/1-bousset.rudy@gmail.com.muttrc
+++ b/.config/mutt/accounts/2-gmail_br.muttrc
@@ -2,12 +2,13 @@
 # muttrc file for account bousset.rudy@gmail.com
 set realname = "Rudy Bousset"
 set from = "bousset.rudy@gmail.com"
-set sendmail = "msmtp -a bousset.rudy@gmail.com"
+set sendmail = "msmtp -a gmail_br"
 alias me Rudy Bousset <bousset.rudy@gmail.com>
-set folder = "$MAIL/bousset.rudy@gmail.com"
-set header_cache = $XDG_RUNTIME_DIR/mutt/bousset.rudy@gmail.com/headers
-set message_cachedir = $XDG_RUNTIME_DIR/mutt/bousset.rudy@gmail.com/bodies
+set folder = "$MAIL/gmail_br"
+set header_cache = $XDG_RUNTIME_DIR/mutt/gmail_br/headers
+set message_cachedir = $XDG_RUNTIME_DIR/mutt/gmail_br/bodies
 set mbox_type = Maildir
+set crypt_autosign = yes
 
 bind index,pager gg noop
 bind index,pager g noop
@@ -16,7 +17,7 @@ bind index,pager C noop
 bind index gg first-entry
 bind pager gg top
 bind pager G bottom
-macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc bousset.rudy@gmail.com<enter>" "run mbsync to sync bousset.rudy@gmail.com"
+macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc gmail_br<enter>" "run mbsync to sync bousset.rudy@gmail.com"
 unmailboxes *
 
 mailboxes "=INBOX" "=[Gmail]/Sent Mail" "=[Gmail]/Drafts" "=[Gmail]/Spam" "=[Gmail]/Trash" "=Keep"
diff --git a/.config/mutt/accounts/2-olsen.oyvind.nor@gmail.com.muttrc b/.config/mutt/accounts/3-gmail_oon.muttrc
index f403325..c857da5 100644
--- a/.config/mutt/accounts/2-olsen.oyvind.nor@gmail.com.muttrc
+++ b/.config/mutt/accounts/3-gmail_oon.muttrc
@@ -2,12 +2,13 @@
 # muttrc file for account olsen.oyvind.nor@gmail.com
 set realname = "Joe"
 set from = "olsen.oyvind.nor@gmail.com"
-set sendmail = "msmtp -a olsen.oyvind.nor@gmail.com"
+set sendmail = "msmtp -a gmail_oon"
 alias me Joe <olsen.oyvind.nor@gmail.com>
-set folder = "$MAIL/olsen.oyvind.nor@gmail.com"
-set header_cache = $XDG_RUNTIME_DIR/mutt/olsen.oyvind.nor@gmail.com/headers
-set message_cachedir = $XDG_RUNTIME_DIR/mutt/olsen.oyvind.nor@gmail.com/bodies
+set folder = "$MAIL/gmail_oon"
+set header_cache = $XDG_RUNTIME_DIR/mutt/gmail_oon/headers
+set message_cachedir = $XDG_RUNTIME_DIR/mutt/gmail_oon/bodies
 set mbox_type = Maildir
+set crypt_autosign = yes
 
 bind index,pager gg noop
 bind index,pager g noop
@@ -16,7 +17,7 @@ bind index,pager C noop
 bind index gg first-entry
 bind pager gg top
 bind pager G bottom
-macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc olsen.oyvind.nor@gmail.com<enter>" "run mbsync to sync olsen.oyvind.nor@gmail.com"
+macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc gmail_oon<enter>" "run mbsync to sync olsen.oyvind.nor@gmail.com"
 unmailboxes *
 
 mailboxes "=INBOX" "=[Gmail]/Sent Mail" "=[Gmail]/Drafts" "=[Gmail]/Spam" "=[Gmail]/Trash" "=Keep"
diff --git a/.config/mutt/accounts/3-towerofsilence777@gmail.com.muttrc b/.config/mutt/accounts/4-gmail_tos.muttrc
index 848da7f..abd7a53 100644
--- a/.config/mutt/accounts/3-towerofsilence777@gmail.com.muttrc
+++ b/.config/mutt/accounts/4-gmail_tos.muttrc
@@ -2,12 +2,13 @@
 # muttrc file for account towerofsilence777@gmail.com
 set realname = "Tower Of Silence"
 set from = "towerofsilence777@gmail.com"
-set sendmail = "msmtp -a towerofsilence777@gmail.com"
+set sendmail = "msmtp -a gmail_tos"
 alias me Tower Of Silence <towerofsilence777@gmail.com>
-set folder = "$MAIL/towerofsilence777@gmail.com"
-set header_cache = $XDG_RUNTIME_DIR/mutt/towerofsilence777@gmail.com/headers
-set message_cachedir = $XDG_RUNTIME_DIR/mutt/towerofsilence777@gmail.com/bodies
+set folder = "$MAIL/gmail_tos"
+set header_cache = $XDG_RUNTIME_DIR/mutt/gmail_tos/headers
+set message_cachedir = $XDG_RUNTIME_DIR/mutt/gmail_tos/bodies
 set mbox_type = Maildir
+set crypt_autosign = yes
 
 bind index,pager gg noop
 bind index,pager g noop
@@ -16,7 +17,7 @@ bind index,pager C noop
 bind index gg first-entry
 bind pager gg top
 bind pager G bottom
-macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc towerofsilence777@gmail.com<enter>" "run mbsync to sync towerofsilence777@gmail.com"
+macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc gmail_tos<enter>" "run mbsync to sync towerofsilence777@gmail.com"
 unmailboxes *
 
 mailboxes "=INBOX" "=[Gmail].Messages envoy&AOk-s" "=[Gmail].Brouillons" "=[Gmail].Spam" "=[Gmail].Corbeille" "=[Gmail].Important" "=[Gmail].Suivis"
diff --git a/.config/mutt/accounts/5-rbousset@secuserve.com.muttrc b/.config/mutt/accounts/5-ss_perso.muttrc
index b0979f6..fb71415 100644
--- a/.config/mutt/accounts/5-rbousset@secuserve.com.muttrc
+++ b/.config/mutt/accounts/5-ss_perso.muttrc
@@ -2,12 +2,13 @@
 # muttrc file for account rbousset@secuserve.com
 set realname = "Rudy Bousset"
 set from = "rbousset@secuserve.com"
-set sendmail = "msmtp -a rbousset@secuserve.com"
+set sendmail = "msmtp -a ss_perso"
 alias me Rudy Bousset <rbousset@secuserve.com>
-set folder = "$MAIL/rbousset@secuserve.com"
-set header_cache = $XDG_RUNTIME_DIR/mutt/rbousset@secuserve.com/headers
-set message_cachedir = $XDG_RUNTIME_DIR/mutt/rbousset@secuserve.com/bodies
+set folder = "$MAIL/ss_perso"
+set header_cache = $XDG_RUNTIME_DIR/mutt/ss_perso/headers
+set message_cachedir = $XDG_RUNTIME_DIR/mutt/ss_perso/bodies
 set mbox_type = Maildir
+set crypt_autosign = yes
 
 bind index,pager gg noop
 bind index,pager g noop
@@ -16,7 +17,7 @@ bind index,pager C noop
 bind index gg first-entry
 bind pager gg top
 bind pager G bottom
-macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc rbousset@secuserve.com<enter>" "run mbsync to sync rbousset@secuserve.com"
+macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc ss_perso<enter>" "run mbsync to sync rbousset@secuserve.com"
 unmailboxes *
 
 mailboxes "=INBOX" "=Sent" "=Drafts" "=Junk" "=Trash" "=Keep" "=NEWS" "=Calendrier" "=T&AOI-ches" "=Notes" "=Reports" "=Reports/OTRS" "=Reports/Trello" "=Reports/Teams" "=Reports/Unimus" "=Reports/vzdump"
diff --git a/.config/mutt/accounts/6-exploitation@secuserve.com.muttrc b/.config/mutt/accounts/6-ss_exploit.muttrc
index 56b88f4..9232643 100644
--- a/.config/mutt/accounts/6-exploitation@secuserve.com.muttrc
+++ b/.config/mutt/accounts/6-ss_exploit.muttrc
@@ -2,12 +2,13 @@
 # muttrc file for account support@secuserve.com
 set realname = "Team Exploitation SecuServe"
 set from = "exploitation@secuserve.com"
-set sendmail = "msmtp -a exploitation@secuserve.com"
+set sendmail = "msmtp -a ss_exploit"
 alias me Team Exploitation SecuServe <exploitation@secuserve.com>
-set folder = "$MAIL/exploitation@secuserve.com"
-set header_cache = $XDG_RUNTIME_DIR/mutt/exploitation@secuserve.com/headers
-set message_cachedir = $XDG_RUNTIME_DIR/mutt/exploitation@secuserve.com/bodies
+set folder = "$MAIL/ss_exploit"
+set header_cache = $XDG_RUNTIME_DIR/mutt/ss_exploit/headers
+set message_cachedir = $XDG_RUNTIME_DIR/mutt/ss_exploit/bodies
 set mbox_type = Maildir
+set crypt_autosign = no
 
 bind index,pager gg noop
 bind index,pager g noop
@@ -16,7 +17,7 @@ bind index,pager C noop
 bind index gg first-entry
 bind pager gg top
 bind pager G bottom
-macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc exploitation@secuserve.com<enter>" "run mbsync to sync exploitation@secuserve.com"
+macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc ss_exploit<enter>" "run mbsync to sync exploitation@secuserve.com"
 unmailboxes *
 
 mailboxes "=INBOX" "=INBOX/- Secuserve" "=INBOX/Altospam" "=INBOX/BAT" "=INBOX/DEBUG" "=INBOX/Erreurs (boite recept)" \
diff --git a/.config/mutt/accounts/7-support@secuserve.com.muttrc b/.config/mutt/accounts/7-ss_support.muttrc
index 846e091..ac92fab 100644
--- a/.config/mutt/accounts/7-support@secuserve.com.muttrc
+++ b/.config/mutt/accounts/7-ss_support.muttrc
@@ -2,19 +2,20 @@
 # muttrc file for account support@secuserve.com
 set realname = "Support SecuServe"
 set from = "support@secuserve.com"
-set sendmail = "msmtp -a support@secuserve.com"
+set sendmail = "msmtp -a ss_support"
 alias me Support SecuServe <support@secuserve.com>
-set folder = "$MAIL/support@secuserve.com"
-set header_cache = $XDG_RUNTIME_DIR/mutt/support@secuserve.com/headers
-set message_cachedir = $XDG_RUNTIME_DIR/mutt/support@secuserve.com/bodies
+set folder = "$MAIL/ss_support"
+set header_cache = $XDG_RUNTIME_DIR/mutt/ss_support/headers
+set message_cachedir = $XDG_RUNTIME_DIR/mutt/ss_support/bodies
 set mbox_type = Maildir
+set crypt_autosign = no
 
 bind index,pager gg noop
 bind index,pager g noop
 bind index,pager M noop
 bind index,pager C noop
 bind index gg first-entry
-macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc support@secuserve.com<enter>" "run mbsync to sync support@secuserve.com"
+macro index o "<shell-escape>killall mbsync >/dev/null 2>&1; mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc ss_support<enter>" "run mbsync to sync support@secuserve.com"
 unmailboxes *
 
 mailboxes "=INBOX" "=INBOX/ALFRESCO" "=INBOX/FIN EVAL" "=INBOX/NAS" "=INBOX/Owentis notif" \
diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
index 99901b4..50d90c2 100644
--- a/.config/mutt/muttrc
+++ b/.config/mutt/muttrc
@@ -1,15 +1,17 @@
 # vim: filetype=neomuttrc
 source $XDG_CONFIG_HOME/mutt/defaults.muttrc
-source $XDG_CONFIG_HOME/mutt/accounts/1-bousset.rudy@gmail.com.muttrc
-macro index,pager <f1> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/1-bousset.rudy@gmail.com.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to bousset.rudy@gmail.com"
-macro index,pager 1 '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/1-bousset.rudy@gmail.com.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to bousset.rudy@gmail.com"
-macro index,pager <f2> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/2-olsen.oyvind.nor@gmail.com.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to olsen.oyvind.nor@gmail.com"
-macro index,pager 2 '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/2-olsen.oyvind.nor@gmail.com.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to olsen.oyvind.nor@gmail.com"
-# macro index,page <f3> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/3-towerofsilence777@gmail.com.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to towerofsilence777@gmail.com"
-# macro index,page 3 '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/3-towerofsilence777@gmail.com.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to towerofsilence777@gmail.com"
-macro index,pager <f5> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/5-rbousset@secuserve.com.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to rbousset@secuserve.com"
-macro index,pager 5 '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/5-rbousset@secuserve.com.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to rbousset@secuserve.com"
-macro index,pager <f6> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/6-exploitation@secuserve.com.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to exploitation@secuserve.com"
-macro index,pager 6 '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/6-exploitation@secuserve.com.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to exploitation@secuserve.com"
-macro index,pager <f7> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/7-support@secuserve.com.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to support@secuserve.com"
-macro index,pager 7 '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/7-support@secuserve.com.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to support@secuserve.com"
+source $XDG_CONFIG_HOME/mutt/accounts/1-main.muttrc
+macro index,pager <f1> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/1-main.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to rrbo@proton.me"
+macro index,pager 1    '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/1-main.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to rrbo@proton.me"
+macro index,pager <f2> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/2-gmail_br.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to bousset.rudy@gmail.com"
+macro index,pager 2    '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/2-gmail_br.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to bousset.rudy@gmail.com"
+macro index,pager <f3> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/2-gmail_oon.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to olsen.oyvind.nor@gmail.com"
+macro index,pager 3    '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/2-gmail_oon.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to olsen.oyvind.nor@gmail.com"
+# macro index,pager <f4> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/3-gmail_tos.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to towerofsilence777@gmail.com"
+# macro index,pager 4    '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/3-gmail_tos.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to towerofsilence777@gmail.com"
+macro index,pager <f5> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/5-ss_perso.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to rbousset@secuserve.com"
+macro index,pager 5    '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/5-ss_perso.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to rbousset@secuserve.com"
+macro index,pager <f6> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/6-ss_exploit.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to exploitation@secuserve.com"
+macro index,pager 6    '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/6-ss_exploit.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to exploitation@secuserve.com"
+macro index,pager <f7> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/7-ss_support.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to support@secuserve.com"
+macro index,pager 7    '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/7-ss_support.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to support@secuserve.com"
diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc
index e007353..203ebd4 100644
--- a/.config/x11/xinitrc
+++ b/.config/x11/xinitrc
@@ -1,7 +1,7 @@
 # vim: filetype=sh
 
 startif() {
-	pgrep "$1" >/dev/null || "$@" >/dev/null 2>&1 &
+	pgrep "$(basename "$1")" >/dev/null || "$@" >/dev/null 2>&1 &
 }
 
 export LANG='en_US.UTF-8'
@@ -18,6 +18,7 @@ startif mpd-notification
 startif xscreensaver --no-splash
 startif dwmblocks
 startif sb-updatempd
+startif /compat/linux/usr/lib/protonmail/bridge/proton-bridge --noninteractive
 # ekb
 cd "$HOME"
 xrdb "$HOME"/.config/x11/xresources