Merge branch 'master' into self-signed-cert

README.md

@@ -36,6 +36,7 @@ Specifically, this wizard:
 - `msmtp` - sends the email.
 - `pass` - safely encrypts passwords (required at install).
 - `ca-certificates` - required for SSL. Probably installed already.
+- `gettext` - writes config files. Probably installed already.
 
 **Note**: There's a chance of errors if you use a slow-release distro like
 Ubuntu, Debian, or Mint. If you get errors in `neomutt`, install the most

bin/mw

@@ -174,20 +174,14 @@ askinfo() {
 	hostname="${fulladdr#*@}"
 	login="${login:-$fulladdr}"
 	if [ -n "${password+x}" ]; then
-		createpass
+		insertpass
 	else
 		getpass
 	fi
 }
 
-createpass() {
-	echo "$password" >"$PASSWORD_STORE_DIR/$passprefix$fulladdr"
-	"$GPG" -qe $(printf -- " -r %s" $(cat "$PASSWORD_STORE_DIR/.gpg-id")) "$PASSWORD_STORE_DIR/$passprefix$fulladdr"
-	case "$(uname)" in
-	Darwin | *BSD) rm -P "$PASSWORD_STORE_DIR/$passprefix$fulladdr" ;;
-	*) shred -u "$PASSWORD_STORE_DIR/$passprefix$fulladdr" ;;
-	esac
-	rm -f "$PASSWORD_STORE_DIR/$passprefix$fulladdr"
+insertpass() {
+	printf "%s" "$password" | pass insert -fe "$PASSWORD_STORE_DIR/$passprefix$fulladdr"
 }
 
 errorexit() {
@@ -331,7 +325,7 @@ reorder() {
 
 while getopts "rfpXlhodTYD:y:i:I:s:S:u:a:n:P:x:m:t:c:" o; do case "${o}" in
 	l) setact list ;;
-	r) setact reorder1 ;;
+	r) setact reorder ;;
 	d) setact delete ;;
 	D)
 		setact delete

share/domains.csv

@@ -89,6 +89,7 @@ diplomats.com,imap.mail.com,993,smtp.mail.com,587
 dismail.de,imap.dismail.de,993,smtp.dismail.de,465
 disroot.org,disroot.org,993,disroot.org,587
 distruzione.org,mail.autistici.org,993,smtp.autistici.org,465
+domeneshop.no,imap.domeneshop.no,993,smtp.domeneshop.no,587
 dorriseaton.com,outlook.office365.com,993,smtp.office365.com,587
 dr.com,imap.mail.com,993,smtp.mail.com,587
 duke.edu,outlook.office365.com,993,smtp.office365.com,587
@@ -118,7 +119,7 @@ fsmpi.rwth-aachen.de,mail.fsmpi.rwth-aachen.de,993,mail.fsmpi.rwth-aachen.de,465
 fsu-jena,exchange.uni-jena.de,993,smtp.uni-jena.de,587
 gcc.edu,imap-mail.outlook.com,993,smtp-mail.outlook.com,587
 getbackinthe.kitchen,mail.cock.li,993,mail.cock.li,587
-ghalv.no,mail.ghalv.no,993,mail.ghalv.no,587
+ghalv.no,mail.ghalv.no,993,mail.ghalv.no,465
 gmail.com,imap.gmail.com,993,smtp.gmail.com,587
 gmx.*,imap.gmx.net,993,mail.gmx.net,587
 go2.pl,poczta.o2.pl,993,poczta.o2.pl,465

share/mbsync-temp

@@ -16,7 +16,7 @@ Channel $fulladdr
 Expunge Both
 $master :$fulladdr-remote:
 $slave :$fulladdr-local:
-Patterns * !"[Gmail]/All Mail"
+Patterns * !"[Gmail]/All Mail" !"*fts-flatcurve*" !"*virtual*"
 Create Both
 SyncState *
 MaxMessages $maxmes

share/mutt-wizard.muttrc

@@ -91,7 +91,7 @@ macro index,pager ga "<change-folder>=Archive<enter>" "go to archive"
 macro index,pager Ma ";<save-message>=Archive<enter>" "move mail to archive"
 macro index,pager Ca ";<copy-message>=Archive<enter>" "copy mail to archive"
 
-#set crypt_autosign = yes
+#set crypt_auto_sign = yes
 #set crypt_opportunistic_encrypt = yes
 #set pgp_self_encrypt = yes
 #set pgp_default_key  = 'your@gpgemailaddre.ss'