vim: remove vimwiki, mainly just using vim-orgmode now

[dotfiles.git] / mutt / muttrc

diff --git a/mutt/muttrc b/mutt/muttrc
index 3c9a2dab0949c83422ed5f1c38a0d68e44ad9be1..a3c379a4498bacadab0b154f0ab5ee5572f5f3ef 100644 (file)
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -13,7 +13,7 @@ group -group ultrahaptics -rx @ultrahaptics.com
 group -group fpp -rx @fppnt.com
 
 set mail_check = 0
 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
 
 set forward_format = "Fwd: %s"
 set forward_quote = yes
 


@@ -82,8 +82,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
 
 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
 set send_charset="utf-8"            # only utf8
 
 # GnuPG


@@ -99,7 +97,8 @@ 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 .*@bitbucket.org
 group -group nosign -rx jira@.*atlassian.net
 group -group nosign -rx gitlab.incoming@ultrahaptics.com

-group -group nosign -rx incomming\+.*@.*\.gitlab.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"
 
 send-hook .            "set crypt_autosign = yes"
 send-hook "%t nosign"  "set crypt_autosign = no"