update

8 files changed, 70 insertions, 60 deletions

diff --git a/.config/mutt/accounts/1-bousset.rudy@gmail.com.muttrc b/.config/mutt/accounts/1-bousset.rudy@gmail.com.muttrc
index b284199..1b7ce9a 100644
--- a/.config/mutt/accounts/1-bousset.rudy@gmail.com.muttrc
+++ b/.config/mutt/accounts/1-bousset.rudy@gmail.com.muttrc
@@ -4,9 +4,9 @@ set realname = "Rudy Bousset"
 set from = "bousset.rudy@gmail.com"
 set sendmail = "msmtp -a bousset.rudy@gmail.com"
 alias me Rudy Bousset <bousset.rudy@gmail.com>
-set folder = "/var/mail/jozan/bousset.rudy@gmail.com"
-set header_cache = /home/jozan/.cache/mutt-wizard/bousset.rudy@gmail.com/headers
-set message_cachedir = /home/jozan/.cache/mutt-wizard/bousset.rudy@gmail.com/bodies
+set folder = "$MAIL/bousset.rudy@gmail.com"
+set header_cache = $XDG_CACHE_HOME/mutt-wizard/bousset.rudy@gmail.com/headers
+set message_cachedir = $XDG_CACHE_HOME/mutt-wizard/bousset.rudy@gmail.com/bodies
 set mbox_type = Maildir
 
 bind index,pager gg noop
@@ -14,7 +14,7 @@ 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>mbsync -c /usr/home/jozan/.config/mbsync/mbsyncrc bousset.rudy@gmail.com<enter>" "run mbsync to sync bousset.rudy@gmail.com"
+macro index o "<shell-escape>mbsync -c $XDG_CONFIG_HOME/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"
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 8daa8f4..7542f24 100644
--- a/.config/mutt/accounts/2-olsen.oyvind.nor@gmail.com.muttrc
+++ b/.config/mutt/accounts/2-olsen.oyvind.nor@gmail.com.muttrc
@@ -4,9 +4,9 @@ set realname = "Joe"
 set from = "olsen.oyvind.nor@gmail.com"
 set sendmail = "msmtp -a olsen.oyvind.nor@gmail.com"
 alias me Joe <olsen.oyvind.nor@gmail.com>
-set folder = "/var/mail/jozan/olsen.oyvind.nor@gmail.com"
-set header_cache = /home/jozan/.cache/mutt-wizard/olsen.oyvind.nor@gmail.com/headers
-set message_cachedir = /home/jozan/.cache/mutt-wizard/olsen.oyvind.nor@gmail.com/bodies
+set folder = "$MAIL/olsen.oyvind.nor@gmail.com"
+set header_cache = $XDG_CACHE_HOME/mutt-wizard/olsen.oyvind.nor@gmail.com/headers
+set message_cachedir = $XDG_CACHE_HOME/mutt-wizard/olsen.oyvind.nor@gmail.com/bodies
 set mbox_type = Maildir
 
 bind index,pager gg noop
@@ -14,7 +14,7 @@ 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>mbsync -c /usr/home/jozan/.config/mbsync/mbsyncrc olsen.oyvind.nor@gmail.com<enter>" "run mbsync to sync olsen.oyvind.nor@gmail.com"
+macro index o "<shell-escape>mbsync -c $XDG_CONFIG_HOME/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"
diff --git a/.config/mutt/accounts/3-towerofsilence777@gmail.com.muttrc b/.config/mutt/accounts/3-towerofsilence777@gmail.com.muttrc
index 70f3b22..01972ac 100644
--- a/.config/mutt/accounts/3-towerofsilence777@gmail.com.muttrc
+++ b/.config/mutt/accounts/3-towerofsilence777@gmail.com.muttrc
@@ -4,9 +4,9 @@ set realname = "Tower Of Silence"
 set from = "towerofsilence777@gmail.com"
 set sendmail = "msmtp -a towerofsilence777@gmail.com"
 alias me Tower Of Silence <towerofsilence777@gmail.com>
-set folder = "/var/mail/jozan/towerofsilence777@gmail.com"
-set header_cache = /home/jozan/.cache/mutt-wizard/towerofsilence777@gmail.com/headers
-set message_cachedir = /home/jozan/.cache/mutt-wizard/towerofsilence777@gmail.com/bodies
+set folder = "$MAIL/towerofsilence777@gmail.com"
+set header_cache = $XDG_CACHE_HOME/mutt-wizard/towerofsilence777@gmail.com/headers
+set message_cachedir = $XDG_CACHE_HOME/mutt-wizard/towerofsilence777@gmail.com/bodies
 set mbox_type = Maildir
 
 bind index,pager gg noop
@@ -14,7 +14,7 @@ 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>mbsync -c /usr/home/jozan/.config/mbsync/mbsyncrc towerofsilence777@gmail.com<enter>" "run mbsync to sync towerofsilence777@gmail.com"
+macro index o "<shell-escape>mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc towerofsilence777@gmail.com<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-rbousset@secuserve.com.muttrc
index 89b6bc2..6772013 100644
--- a/.config/mutt/accounts/5-rbousset@secuserve.com.muttrc
+++ b/.config/mutt/accounts/5-rbousset@secuserve.com.muttrc
@@ -4,9 +4,9 @@ set realname = "Rudy Bousset"
 set from = "rbousset@secuserve.com"
 set sendmail = "msmtp -a rbousset@secuserve.com"
 alias me Rudy Bousset <rbousset@secuserve.com>
-set folder = "/var/mail/jozan/rbousset@secuserve.com"
-set header_cache = /home/jozan/.cache/mutt-wizard/rbousset@secuserve.com/headers
-set message_cachedir = /home/jozan/.cache/mutt-wizard/rbousset@secuserve.com/bodies
+set folder = "$MAIL/rbousset@secuserve.com"
+set header_cache = $XDG_CACHE_HOME/mutt-wizard/rbousset@secuserve.com/headers
+set message_cachedir = $XDG_CACHE_HOME/mutt-wizard/rbousset@secuserve.com/bodies
 set mbox_type = Maildir
 
 bind index,pager gg noop
@@ -14,7 +14,7 @@ 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>mbsync -c /usr/home/jozan/.config/mbsync/mbsyncrc rbousset@secuserve.com<enter>" "run mbsync to sync rbousset@secuserve.com"
+macro index o "<shell-escape>mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc rbousset@secuserve.com<enter>" "run mbsync to sync rbousset@secuserve.com"
 unmailboxes *
 
 mailboxes "=INBOX" "=Sent" "=Drafts" "=Trash" "=Calendrier" "=NEWS"
diff --git a/.config/mutt/accounts/6-exploitation@secuserve.com.muttrc b/.config/mutt/accounts/6-exploitation@secuserve.com.muttrc
index a8106ca..bc6becb 100644
--- a/.config/mutt/accounts/6-exploitation@secuserve.com.muttrc
+++ b/.config/mutt/accounts/6-exploitation@secuserve.com.muttrc
@@ -4,9 +4,9 @@ set realname = "Team Exploitation SecuServe"
 set from = "exploitation@secuserve.com"
 set sendmail = "msmtp -a exploitation@secuserve.com"
 alias me Team Exploitation SecuServe <exploitation@secuserve.com>
-set folder = "/var/mail/jozan/exploitation@secuserve.com"
-set header_cache = /home/jozan/.cache/mutt-wizard/exploitation@secuserve.com/headers
-set message_cachedir = /home/jozan/.cache/mutt-wizard/exploitation@secuserve.com/bodies
+set folder = "$MAIL/exploitation@secuserve.com"
+set header_cache = $XDG_CACHE_HOME/mutt-wizard/exploitation@secuserve.com/headers
+set message_cachedir = $XDG_CACHE_HOME/mutt-wizard/exploitation@secuserve.com/bodies
 set mbox_type = Maildir
 
 bind index,pager gg noop
@@ -14,7 +14,7 @@ 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>mbsync -c /usr/home/jozan/.config/mbsync/mbsyncrc exploitation@secuserve.com<enter>" "run mbsync to sync exploitation@secuserve.com"
+macro index o "<shell-escape>mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc exploitation@secuserve.com<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-support@secuserve.com.muttrc
index b1c2a8b..8b99b9b 100644
--- a/.config/mutt/accounts/7-support@secuserve.com.muttrc
+++ b/.config/mutt/accounts/7-support@secuserve.com.muttrc
@@ -4,9 +4,9 @@ set realname = "Support SecuServe"
 set from = "support@secuserve.com"
 set sendmail = "msmtp -a support@secuserve.com"
 alias me Support SecuServe <support@secuserve.com>
-set folder = "/var/mail/jozan/support@secuserve.com"
-set header_cache = /home/jozan/.cache/mutt-wizard/support@secuserve.com/headers
-set message_cachedir = /home/jozan/.cache/mutt-wizard/support@secuserve.com/bodies
+set folder = "$MAIL/support@secuserve.com"
+set header_cache = $XDG_CACHE_HOME/mutt-wizard/support@secuserve.com/headers
+set message_cachedir = $XDG_CACHE_HOME/mutt-wizard/support@secuserve.com/bodies
 set mbox_type = Maildir
 
 bind index,pager gg noop
@@ -14,7 +14,7 @@ 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>mbsync -c /usr/home/jozan/.config/mbsync/mbsyncrc support@secuserve.com<enter>" "run mbsync to sync support@secuserve.com"
+macro index o "<shell-escape>mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc support@secuserve.com<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/defaults.muttrc b/.config/mutt/defaults.muttrc
index db37a33..d1fee1a 100644
--- a/.config/mutt/defaults.muttrc
+++ b/.config/mutt/defaults.muttrc
@@ -4,11 +4,12 @@
 # In the interest of seamless updating, do not edit this file.
 # If you want to override any settings, set those in your muttrc.
 set editor = "emacsclient -nw -a nvim"
-set mailcap_path = /usr/home/jozan/.config/mutt/mailcap
+set mailcap_path = $XDG_CONFIG_HOME/mutt/mailcap
 set date_format="%d/%m/%y %H:%M"
 set index_format="%2C %Z %?X?A& ? %D %-16.16F %s (%-4.4c)"
 set new_mail_command = "notify-send -u normal 'NeoMutt' '  %n new mail(s)'"
-set sort = 'reverse-date'
+set sort = reverse-threads
+set sort_aux = last-date-received
 set smtp_authenticators = 'gssapi:login'
 set query_command = "abook -C $XDG_CONFIG_HOME/abook/abookrc --datafile $XDG_DATA_HOME/abook/addressbook --mutt-query '%s'"
 set rfc2047_parameters = yes
@@ -23,15 +24,45 @@ set forward_format = "Fwd: %s"	# format of subject when forwarding
 set forward_quote		# include message in forwards
 set reverse_name		# reply as whomever it was to
 set include			# include message in replies
-set mail_check=60 # to avoid lags using IMAP with some email providers (yahoo for example)
+set mail_check = 60 # to avoid lags using IMAP with some email providers (yahoo for example)
+set mail_check_stats
+set nobeep
+set charset = utf-8
+set noallow_8bit
+set uncollapse_jump
+set pager_index_lines = 10
+set text_flowed = yes
+
+#set crypt_opportunistic_encrypt = yes
+#set pgp_self_encrypt = yes
+set crypt_autosign = yes
+set pgp_default_key = '0x0EAB41FC2D9F762A'
+
 auto_view text/html		# automatically show html (mailcap uses w3m)
 auto_view application/pgp-encrypted
 alternative_order text/plain text/enriched text/html
+
+# Sidebar mappings
+set sidebar_visible = yes
+set sidebar_width = 32
+set sidebar_short_path = yes
+set sidebar_next_new_wrap = yes
+set sidebar_delim_chars = '/'
+set mail_check_stats
+set sidebar_format = '%D%?F? [%F]?%* %?N?%N/? %?S?%S?'
+set sidebar_indent_string = '  '
+set sidebar_folder_indent = yes
+bind index,pager \Ck sidebar-prev
+bind index,pager \Cj sidebar-next
+bind index,pager \Co sidebar-open
+bind index,pager \Cp sidebar-prev-new
+bind index,pager \Cn sidebar-next-new
+bind index,pager B sidebar-toggle-visible
+
+# General rebindings
 bind index,pager i noop
 bind index,pager g noop
 bind index \Cf noop
-
-# General rebindings
 bind index j next-entry
 bind index k previous-entry
 bind attach <return> view-mailcap
@@ -65,37 +96,16 @@ bind pager \031 previous-line		# Mouse wheel
 bind pager \005 next-line		# Mouse wheel
 bind editor <Tab> complete-query
 
-#set crypt_autosign = yes
-#set crypt_opportunistic_encrypt = yes
-#set pgp_self_encrypt = yes
-set pgp_default_key  = '0x0EAB41FC2D9F762A'
-
 macro index,pager a "<enter-command>set my_pipe_decode=\$pipe_decode pipe_decode<return><pipe-message>abook -C $XDG_CONFIG_HOME/abook/abookrc --datafile $XDG_DATA_HOME/abook/addressbook --add-email<return><enter-command>set pipe_decode=\$my_pipe_decode; unset my_pipe_decode<return>" "add the sender address to abook"
 macro index \Cr "T~U<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
-macro index O "<shell-escape>mbsync -c /usr/home/jozan/.config/mbsync/mbsyncrc -a<enter>" "run mbsync to sync all mail"
+macro index O "<shell-escape>mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc -a<enter>" "run mbsync to sync all mail"
 macro index \Cf "<enter-command>unset wait_key<enter><shell-escape>printf 'Enter a search term to find with notmuch: '; read x; echo \$x >~/.cache/mutt_terms<enter><limit>~i \"\`notmuch search --output=messages \$(cat ~/.cache/mutt_terms) | head -n 600 | perl -le '@a=<>;s/\^id:// for@a;$,=\"|\";print@a' | perl -le '@a=<>; chomp@a; s/\\+/\\\\+/ for@a;print@a' \`\"<enter>" "show only messages matching a notmuch pattern"
 macro index A "<limit>all\n" "show all messages (undo limit)"
 macro compose Y "<first-entry>\
 <pipe-entry>mutt_md2html.sh<enter>\
 <enter-command>source /tmp/neomutt_commands<enter>"
 
-# Sidebar mappings
-set sidebar_visible = yes
-set sidebar_width = 25
-set sidebar_short_path = yes
-set sidebar_next_new_wrap = yes
-set sidebar_delim_chars = '/'
-set mail_check_stats
-set sidebar_format = '%D%?F? [%F]?%* %?N?%N/? %?S?%S?'
-set sidebar_indent_string = ' '
-set sidebar_folder_indent = yes
-bind index,pager \Ck sidebar-prev
-bind index,pager \Cj sidebar-next
-bind index,pager \Co sidebar-open
-bind index,pager \Cp sidebar-prev-new
-bind index,pager \Cn sidebar-next-new
-bind index,pager B sidebar-toggle-visible
-
+# colorscheme
 # color normal            default             default
 # color indicator         brightyellow        red    
 # color tree              default             default 
diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
index 3893b76..04e32a7 100644
--- a/.config/mutt/muttrc
+++ b/.config/mutt/muttrc
@@ -1,9 +1,9 @@
 # vim: filetype=neomuttrc
-source /home/jozan/.config/mutt/defaults.muttrc
-source /home/jozan/.config/mutt/accounts/1-bousset.rudy@gmail.com.muttrc
-macro index,pager i1 '<sync-mailbox><enter-command>source /home/jozan/.config/mutt/accounts/1-bousset.rudy@gmail.com.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to bousset.rudy@gmail.com"
-macro index,pager i2 '<sync-mailbox><enter-command>source /home/jozan/.config/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 i3 '<sync-mailbox><enter-command>source /home/jozan/.config/mutt/accounts/3-towerofsilence777@gmail.com.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to towerofsilence777@gmail.com"
-macro index,pager i5 '<sync-mailbox><enter-command>source /home/jozan/.config/mutt/accounts/5-rbousset@secuserve.com.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to rbousset@secuserve.com"
-macro index,pager i6 '<sync-mailbox><enter-command>source /home/jozan/.config/mutt/accounts/6-exploitation@secuserve.com.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to exploitation@secuserve.com"
-macro index,pager i7 '<sync-mailbox><enter-command>source /home/jozan/.config/mutt/accounts/7-support@secuserve.com.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to support@secuserve.com"
+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 <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,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,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 <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 <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"