X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/dd809bdc6d9d3c73c6d4e3951f9eb920d6f3f858..b76f00cb193eaba72d7515efda5098a724c05620:/mutt/muttrc

diff --git a/mutt/muttrc b/mutt/muttrc
index 813ceb9..c3a76e1 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -2,15 +2,18 @@ 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
 
@@ -20,6 +23,7 @@ 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
@@ -79,8 +83,6 @@ alternative_order text/calendar text/plain text/enriched text/html  # view ical
 set folder       = "$MAILDIR"       # mail folder
 set header_cache = "~/.cache/mutt"  # cache headers for speedss
 
-# SMTP: msmtp
-set sendmail = /usr/bin/msmtp       # use msmtp
 set send_charset="utf-8"            # only utf8
 
 # GnuPG
@@ -95,6 +97,9 @@ 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"
 
@@ -102,4 +107,4 @@ source hooks
 source bindings
 source colors/badfox         # color theme
 
-source accounts/gmail  # source default account
+source accounts/mailfence  # source default account