X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/72a841c80ca15c443eccf8e437c16da487f7e3e4..24e3ac6deff61a37dfcb46eb662c59fa5215a501:/mutt/muttrc

diff --git a/mutt/muttrc b/mutt/muttrc
index 9c19c86..8cb3f59 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -1,11 +1,19 @@
+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
+set use_envelope_from
 set forward_format = "Fwd: %s"
 set forward_quote = yes
 
@@ -15,13 +23,10 @@ set editor       = vim   # d'uh
 set include      = yes   # don't ask, just do
 set delete       = yes   # don't ask, just do
 set date_format  = "!%b %d, %Y at %-H:%M" # use 24-hour clock
+unset signature  # don't try to include a signature
 
 # 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
@@ -37,6 +42,7 @@ subscribe -group ros         @lists.ros.org$
 subscribe -group sailfish    @lists.sailfishos.org
 subscribe -group neovim      ^neovim.*github.com
 subscribe -group mutt        mutt-users@mutt.org
+subscribe -group zsh         zsh-users@zsh.org
 subscribe -group qutebrowser ^qutebrowser.*
 subscribe -group lug         @mailman.lug.org.uk
 
@@ -69,21 +75,15 @@ unhdr_order *
 hdr_order from: to: cc: date: subject: x-clacks-overhead:
 
 # deal with crap
-set mailcap_path = ~/.mutt/mailcap
-auto_view text/html                                     # view html automatically
-alternative_order text/plain text/enriched text/html    # save html for last
-
-# IMAP: offlineimap
-set folder       = "~/mail"         # 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 mailcap_path = $my_config_dir/mailcap
+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: mbsync
+set folder       = "$MAILDIR"       # mail folder
 set header_cache = "~/.cache/mutt"  # cache headers for speedss
-source ~/.mutt/mailboxes            # source mailboxes generetated by offlineimap
 
-# SMTP: msmtp
-set sendmail = /usr/bin/msmtp       # use msmtp
 set send_charset="utf-8"            # only utf8
 
 # GnuPG
@@ -94,13 +94,18 @@ 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 .*@incoming.gitlab.com
+group -group nosign -rx .*@reply.github.com
 send-hook .            "set crypt_autosign = yes"
 send-hook "%t nosign"  "set crypt_autosign = no"
 
-source ~/.mutt/hooks
-source ~/.mutt/bindings
-source ~/.mutt/colors/badfox         # color theme
+source hooks
+source bindings
+source colors/nord         # color theme
+
+source accounts/mailfence  # source default account