From eba3b0eb000cdfd1200ff154bc80bb02d06ae1dd Mon Sep 17 00:00:00 2001 From: "Gunnar K. Halvorsen" Date: Tue, 26 Oct 2021 13:37:32 +0200 Subject: [PATCH 01/14] Added domain to list --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index d59cd32..99517cc 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -111,6 +111,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 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 From 256c091196c6f7713f875e2a327f2c3755d5c45b Mon Sep 17 00:00:00 2001 From: Jberczel Date: Mon, 1 Nov 2021 11:52:59 -0400 Subject: [PATCH 02/14] Cleanup reorder account numbers action Refactors commit 85c5d01 * Keep the comment(s) when reordering account numbers in temp file. Users may accidently reorder rows or rename accounts rather than update order number. * Remove original default config from muttrc. Currently, script only removes the macro shortcuts .If you run reorder action multiple times, you'll end up sourcing multiple "default" config files. --- bin/mw | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/bin/mw b/bin/mw index 5205a13..bcca18d 100755 --- a/bin/mw +++ b/bin/mw @@ -308,23 +308,27 @@ To change an account's password, run \`pass edit your@email.com\`. EOF } -reorder(){ +reorder() { tempfile="$(mktemp -u)" trap 'rm -f $tempfile' HUP INT QUIT TERM PWR EXIT - echo "# Carefully reorder these accounts with the desired numbers." > "$tempfile" + echo "# Carefully reorder these accounts with the desired numbers in the first column. +# DO NOT reorder rows or rename the accounts in the second column." > "$tempfile" sed -n " / i[0-9] / s?\(.* i\|' "$tempfile" + " "$muttrc" >> "$tempfile" ${EDITOR:-vim} "$tempfile" || exit 1 + sed -i -e 's/#.*//' -e '/^$/d' "$tempfile" default="$(sort -n "$tempfile" | head -n 1)" default="${default#* }" - sed -ibu "/.* i[0-9] .*.muttrc/d" "$muttrc" 2>/dev/null; rm -f "$muttrc"bu + sed -ibu " + /.* i[0-9] .*.muttrc/d + /^source.*accounts.*.muttrc/d + " "$muttrc" 2>/dev/null; rm -f "$muttrc"bu awk -v a="$accdir" -v d="$default" ' BEGIN { print "source "a"/"d".muttrc" } { print "macro index,pager i"$1" '\''source "a"/"$2".muttrc!;'\'' \"switch to "$2"\"" } ' "$tempfile" >> "$muttrc" - } while getopts "rfpPXlhodTYD:y:i:I:s:S:u:a:n:x:m:t:" o; do case "${o}" in From 2cb6dfb574834d3d17980d7c41473daa745d76cc Mon Sep 17 00:00:00 2001 From: cshjsc <47149574+cshjsc@users.noreply.github.com> Date: Tue, 2 Nov 2021 19:34:59 +0100 Subject: [PATCH 03/14] Fix html links splitting avoid line splitting. the width option is set to 80 by default, increasing it will avoid breaking long links in two different lines --- share/mailcap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mailcap b/share/mailcap index b355f32..a49145f 100644 --- a/share/mailcap +++ b/share/mailcap @@ -1,6 +1,6 @@ text/plain; $EDITOR %s ; text/html; openfile %s ; nametemplate=%s.html -text/html; lynx -assume_charset=%{charset} -display_charset=utf-8 -dump %s; nametemplate=%s.html; copiousoutput; +text/html; lynx -assume_charset=%{charset} -display_charset=utf-8 -dump -width=1024 %s; nametemplate=%s.html; copiousoutput; image/*; openfile %s ; video/*; setsid mpv --quiet %s &; copiousoutput audio/*; mpv %s ; From bed0470f0db5c814f27a205f27d8fd4c1b42d79c Mon Sep 17 00:00:00 2001 From: "Gunnar K. Halvorsen" Date: Tue, 26 Oct 2021 13:37:32 +0200 Subject: [PATCH 04/14] Added domain to list --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index d59cd32..99517cc 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -111,6 +111,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 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 From 8e81135f8bb79930ed2495b90784cacc83cbb73f Mon Sep 17 00:00:00 2001 From: Matthew McCulley Date: Sun, 7 Nov 2021 09:05:27 -0500 Subject: [PATCH 05/14] Checks $HOME/.confg/zsh/.zshenv for Env variables --- bin/mailsync | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/mailsync b/bin/mailsync index ca7411d..e939b78 100755 --- a/bin/mailsync +++ b/bin/mailsync @@ -23,7 +23,8 @@ pgrep mbsync >/dev/null && { echo "mbsync is already running."; exit ;} eval "$(grep -h -- \ "^\s*\(export \)\?\(MBSYNCRC\|PASSWORD_STORE_DIR\|NOTMUCH_CONFIG\|GNUPGHOME\)=" \ "$HOME/.profile" "$HOME/.bash_profile" "$HOME/.zprofile" "$HOME/.config/zsh/.zprofile" "$HOME/.zshenv" \ - "$HOME/.bashrc" "$HOME/.zshrc" "$HOME/.config/zsh/.zshrc" "$HOME/.pam_environment" 2>/dev/null)" + "$HOME/.config/zsh/.zshenv" "$HOME/.bashrc" "$HOME/.zshrc" "$HOME/.config/zsh/.zshrc" \ + "$HOME/.pam_environment" 2>/dev/null)" export GPG_TTY="$(tty)" From 37c91057f78542e8970cf7698c0c1588153c30f2 Mon Sep 17 00:00:00 2001 From: Aisha Tammy Date: Fri, 31 Dec 2021 22:55:01 +0000 Subject: [PATCH 06/14] add GPG WKS publishing functionality Signed-off-by: Aisha Tammy --- bin/mw | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/mw b/bin/mw index d3129e7..fee8974 100755 --- a/bin/mw +++ b/bin/mw @@ -108,6 +108,8 @@ set trash = "+Trash" set record = "+Sent" $extra $synccmd +macro index \eg \"unset wait_keygpg --list-secret-keys; printf 'Enter email ID of user to publish: '; read eID; printf 'Enter fingerprint of GPG key to publish: '; read eFGPT; /usr/local/libexec/gpg-wks-client --create \\\$eFGPT \\\$eID | msmtp --read-envelope-from --read-recipients -a $fulladdr\" \"publish GPG key to WKS provider\" +macro index \eh \"/usr/local/libexec/gpg-wks-client --receive | msmtp --read-envelope-from --read-recipients -a $fulladdr\" \"confirm GPG publication\" " > "$accdir/$fulladdr.muttrc" [ ! -f "$muttrc" ] && echo "# vim: filetype=neomuttrc" > "$muttrc" From aba07e26f83da9055c16255ace3836f4bfba665e Mon Sep 17 00:00:00 2001 From: 187Qrly <56300140+187Qrly@users.noreply.github.com> Date: Sat, 1 Jan 2022 15:53:33 +0100 Subject: [PATCH 07/14] Make gentoo users aware that they need the "sasl" for the neomutt package. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 372aa02..ddf6f8b 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Specifically, this wizard: #### Dependencies -- `neomutt` - the email client. +- `neomutt` - the email client. (If you are using Gentoo GNU/Linux, you will need the `sasl` use flag to be enabled) - `curl` - tests connections (required at install). - `isync` - downloads and syncs the mail (required if storing IMAP mail locally). - `msmtp` - sends the email. From 0d98a9ef5b76fd60f58a8b8f3196f5d143668069 Mon Sep 17 00:00:00 2001 From: Thamognya <85227613+MeliodasZoom@users.noreply.github.com> Date: Mon, 3 Jan 2022 06:50:21 +0700 Subject: [PATCH 08/14] Update domains.csv --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 99517cc..1cca410 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -274,6 +274,7 @@ tecnico.ulisboa.pt,mail.tecnico.ulisboa.pt,993,mail.tecnico.ulisboa.pt,465 teknik.io,mail.teknik.io,993,mail.teknik.io,587 telenet.be,imap.telenet.be,993,smtp.telenet.be,587 tfwno.gf,mail.cock.li,993,mail.cock.li,587 +thamognya.com,mail.thamognya.com,993,mail.thamognya.com,587 thunix.net,thunix.net,143,thunix.net,25 tlen.pl,poczta.o2.pl,993,poczta.o2.pl,465 tlu.edu,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 From b149d1c9ce80f489006c470636ead617b3082e42 Mon Sep 17 00:00:00 2001 From: Cameron Murtagh <43051455+CMurtagh-LGTM@users.noreply.github.com> Date: Tue, 4 Jan 2022 02:23:11 +0000 Subject: [PATCH 09/14] Add option to use user mailcap Added the option to have a `mailcap` file in `.config/mutt/`. This enables ease of changing what programs are used for viewing. --- share/mutt-wizard.muttrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mutt-wizard.muttrc b/share/mutt-wizard.muttrc index a12a77e..f99d74d 100644 --- a/share/mutt-wizard.muttrc +++ b/share/mutt-wizard.muttrc @@ -3,7 +3,7 @@ # mutt-wizard will have this file sourced from your muttrc. # In the interest of seamless updating, do not edit this file. # If you want to override any settings, set those in your muttrc. -set mailcap_path = /usr/local/share/mutt-wizard/mailcap:$mailcap_path +set mailcap_path = $HOME/.config/mutt/mailcap:/usr/local/share/mutt-wizard/mailcap:$mailcap_path set mime_type_query_command = "file --mime-type -b %s" set date_format="%y/%m/%d %I:%M%p" set index_format="%2C %Z %?X?A& ? %D %-15.15F %s (%-4.4c)" From a82a86c310bbe2c3a71ff4da3b9ed635fed4e06d Mon Sep 17 00:00:00 2001 From: Aisha Tammy Date: Mon, 10 Jan 2022 20:06:52 +0000 Subject: [PATCH 10/14] change path of command to use prefix Signed-off-by: Aisha Tammy --- bin/mw | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/mw b/bin/mw index fee8974..d2a67d7 100755 --- a/bin/mw +++ b/bin/mw @@ -108,8 +108,8 @@ set trash = "+Trash" set record = "+Sent" $extra $synccmd -macro index \eg \"unset wait_keygpg --list-secret-keys; printf 'Enter email ID of user to publish: '; read eID; printf 'Enter fingerprint of GPG key to publish: '; read eFGPT; /usr/local/libexec/gpg-wks-client --create \\\$eFGPT \\\$eID | msmtp --read-envelope-from --read-recipients -a $fulladdr\" \"publish GPG key to WKS provider\" -macro index \eh \"/usr/local/libexec/gpg-wks-client --receive | msmtp --read-envelope-from --read-recipients -a $fulladdr\" \"confirm GPG publication\" +macro index \eg \"unset wait_keygpg --list-secret-keys; printf 'Enter email ID of user to publish: '; read eID; printf 'Enter fingerprint of GPG key to publish: '; read eFGPT; $prefix/libexec/gpg-wks-client --create \\\$eFGPT \\\$eID | msmtp --read-envelope-from --read-recipients -a $fulladdr\" \"publish GPG key to WKS provider\" +macro index \eh \"$prefix/libexec/gpg-wks-client --receive | msmtp --read-envelope-from --read-recipients -a $fulladdr\" \"confirm GPG publication\" " > "$accdir/$fulladdr.muttrc" [ ! -f "$muttrc" ] && echo "# vim: filetype=neomuttrc" > "$muttrc" From e816f80a5a85a47f8128e89b0bb94c9fdf32d415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Huynh=20D=C6=B0=C6=A1ng?= Date: Sun, 30 Jan 2022 10:37:26 +0700 Subject: [PATCH 11/14] Update domains.csv --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 1cca410..65625ef 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -328,3 +328,4 @@ zaclys.net,mail.zaclys.net,993,mail.zaclys.net,465 zju.edu.cn,imap.zju.edu.cn,993,smtp.zju.edu.cn,994 zoho.com,imap.zoho.com,993,smtp.zoho.com,465 zohomail.eu,imap.zoho.eu,993,smtp.zoho.eu,465 +sis.hust.edu.vn,outlook.office365.com,993,smtp.office365.com,587 From 6e869214b14d3ebffd5987b3ec50e6618ed289c0 Mon Sep 17 00:00:00 2001 From: Beau McCartney Date: Sun, 30 Jan 2022 22:02:00 -0700 Subject: [PATCH 12/14] Update domains.csv --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 65625ef..f1fb031 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -285,6 +285,7 @@ tum.de,xmail.mwn.de,993,postout.lrz.de,587 txstate.edu,outlook.office365.com,993,smtp.office365.com,587 ua.pt,outlook.office365.com,993,mail.ua.pt,25 uach.mx,imap.gmail.com,993,smtp.gmail.com,587 +ucalgary.ca,outlook.office365.com,993,smtp.office365.com,587 ucdavis.edu,imap.gmail.com,993,smtp.gmail.com,587 uclive.ac.nz,outlook.office365.com,993,smtp.office365.com,587 ucsb.edu,imap.gmail.com,993,smtp.gmail.com,587 From 67b704808d64850461ecb11d9f6086086dbc1db6 Mon Sep 17 00:00:00 2001 From: Slin Lee Date: Wed, 9 Mar 2022 22:33:24 -0800 Subject: [PATCH 13/14] Wrap text when reading emails at 80 chars For increased legibility. --- share/mutt-wizard.muttrc | 1 + 1 file changed, 1 insertion(+) diff --git a/share/mutt-wizard.muttrc b/share/mutt-wizard.muttrc index f99d74d..3537aa8 100644 --- a/share/mutt-wizard.muttrc +++ b/share/mutt-wizard.muttrc @@ -27,6 +27,7 @@ auto_view text/html # automatically show html (mailcap uses lynx) auto_view application/pgp-encrypted #set display_filter = "tac | sed '/\\\[-- Autoview/,+1d' | tac" # Suppress autoview messages. alternative_order text/plain text/enriched text/html +set width = 80 # wordwrap when reading emails bind index,pager i noop bind index,pager g noop From 641587fbf751eec16818a5b858a8944aad305da5 Mon Sep 17 00:00:00 2001 From: Erick Chacon Date: Fri, 11 Mar 2022 23:49:23 -0500 Subject: [PATCH 14/14] Lancaster University (UK) and National University of Engineering (PERU) --- share/domains.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/domains.csv b/share/domains.csv index f1fb031..e0aa74c 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -150,6 +150,7 @@ kean.edu,imap.gmail.com,993,smtp.gmail.com,587 kipras.org,mail.kipras.org,993,mail.kipras.org,587 krutt.org,mail.autistici.org,993,smtp.autistici.org,465 kth.se,webmail.kth.se,993,smtp.kth.se,587 +lancaster.ac.uk,outlook.office365.com,993,smtp.office365.com,587 larbs.xyz,mail.larbs.xyz,993,mail.larbs.xyz,587 lavabit.com,lavabit.com,993,lavabit.com,587 librem.one,imap.librem.one,993,smtp.librem.one,465 @@ -293,6 +294,7 @@ ucsc.edu,imap.gmail.com,993,smtp.gmail.com,587 ukr.net,imap.ukr.net,993,smtp.ukr.net,465 uni-duesseldorf.de,mail.hhu.de,993,mail.hhu.de,465 uni-jena.de,imap.uni-jena.de,993,smtp.uni-jena.de,587 +uni.edu.pe,imap.gmail.com,993,smtp.gmail.com,587 uni.strath.ac.uk,outlook.office365.com,993,smtp.office365.com,587 unilodz.eu,outlook.office365.com,993,smtp.office365.com,587 unitn.it,imap.gmail.com,993,smtp.gmail.com,587