X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/82dd761cf1842c38aa90bd85a53a117e192609c5..cf75e935fef989adf6958d77d1cf69ee4bbec57b:/mutt/muttrc

diff --git a/mutt/muttrc b/mutt/muttrc
index d4b40dd..7ec5a85 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -2,12 +2,15 @@ set my_config_dir = $XDG_CONFIG_HOME/mutt
 
 # general settings
 alternates -group me samir.benmendil@gmail.com ram-z@hotmail.com @rmz.io
+alternates -group me samir.benmendil@mailfence.com
 alternates -group me -group chakra ram-z@chakra chakra@rmz.io
 alternates -group me -group unimaas s.benmendil@student.maastrichtuniversity.nl
 alternates -group me -group cadscan sb@cad-scan.co.uk
 alternates -group me -group ultrahaptics samir.benmendil@ultrahaptics.com
+alternates -group me -group fpp samir@fppnt.com
 
 group -group ultrahaptics -rx @ultrahaptics.com
+group -group fpp -rx @fppnt.com
 
 set mail_check = 0
 set envelope_from
@@ -23,10 +26,6 @@ set date_format  = "!%b %d, %Y at %-H:%M" # use 24-hour clock
 
 # send clacks
 my_hdr X-Clacks-Overhead: GNU Terry Pratchett
-my_hdr Bcc: sent@rmz.io
-
-# goobook
-set query_command = "goobook query '%s'"
 
 # sort/threading
 set sort              = threads
@@ -75,20 +74,14 @@ hdr_order from: to: cc: date: subject: x-clacks-overhead:
 
 # deal with crap
 set mailcap_path = $my_config_dir/mailcap
-auto_view text/html                                     # view html automatically
-alternative_order text/plain text/enriched text/html    # save html for last
+auto_view text/html      # view html automatically
+auto_view text/calendar  # view ical automatically
+alternative_order text/calendar text/plain text/enriched text/html  # view ical first, html last
 
-# IMAP: offlineimap
+# IMAP: mbsync
 set folder       = "$MAILDIR"       # mail folder
-set spoolfile    = "+gmail/inbox"   # set inbox
-unset record                        # do not move sent msgs to a folder, gmail does that
-unset move                          # do not move read msgs, gmail does that
-set postponed    = "+gmail/drafts"  # drafts folder
 set header_cache = "~/.cache/mutt"  # cache headers for speedss
-source mailboxes                    # source mailboxes generetated by offlineimap
 
-# SMTP: msmtp
-set sendmail = /usr/bin/msmtp       # use msmtp
 set send_charset="utf-8"            # only utf8
 
 # GnuPG
@@ -99,13 +92,17 @@ set crypt_verify_sig         = yes  # verify signatures
 set pgp_long_ids             = yes  # use 64 bit key IDs
 set pgp_mime_auto            = no   # don't fallback to inline mime
 set pgp_use_gpg_agent        = yes  # don't ask for passwords
-source /usr/share/doc/mutt/samples/gpg.rc
+source gpg
 
 group -group nosign -rx .*@bitbucket.org
 group -group nosign -rx jira@.*atlassian.net
+group -group nosign -rx gitlab.incoming@ultrahaptics.com
+group -group nosign -rx incomming\+.*@.*\.gitlab.com
 send-hook .            "set crypt_autosign = yes"
 send-hook "%t nosign"  "set crypt_autosign = no"
 
 source hooks
 source bindings
 source colors/badfox         # color theme
+
+source accounts/mailfence  # source default account