From a514a615c56d94211efe62ea1f3ce31f10d65629 Mon Sep 17 00:00:00 2001 From: David Runge Date: Sun, 1 May 2022 11:21:44 +0200 Subject: mutt: Use XDG compliant config location .config/mutt/*: Use XDG_CONFIG_DIR compliant config location --- .mutt/accounts.rc | 7 ---- .mutt/attachments.rc | 2 -- .mutt/color.rc | 84 ------------------------------------------- .mutt/dave@sleepmap.de.rc | 12 ------- .mutt/dave@sleepmap.de.sig | 1 - .mutt/default.rc | 11 ------ .mutt/dvzrv@archlinux.org.rc | 12 ------- .mutt/dvzrv@archlinux.org.sig | 1 - .mutt/gpg.rc | 17 --------- .mutt/khard.rc | 5 --- .mutt/macros.rc | 49 ------------------------- .mutt/muttrc | 32 ----------------- .mutt/security.rc | 2 -- .mutt/sidebar.rc | 14 -------- .mutt/sorting.rc | 2 -- 15 files changed, 251 deletions(-) delete mode 100644 .mutt/accounts.rc delete mode 100644 .mutt/attachments.rc delete mode 100644 .mutt/color.rc delete mode 100644 .mutt/dave@sleepmap.de.rc delete mode 100644 .mutt/dave@sleepmap.de.sig delete mode 100644 .mutt/default.rc delete mode 100644 .mutt/dvzrv@archlinux.org.rc delete mode 100644 .mutt/dvzrv@archlinux.org.sig delete mode 100644 .mutt/gpg.rc delete mode 100644 .mutt/khard.rc delete mode 100644 .mutt/macros.rc delete mode 100644 .mutt/muttrc delete mode 100644 .mutt/security.rc delete mode 100644 .mutt/sidebar.rc delete mode 100644 .mutt/sorting.rc (limited to '.mutt') diff --git a/.mutt/accounts.rc b/.mutt/accounts.rc deleted file mode 100644 index fb8eac2..0000000 --- a/.mutt/accounts.rc +++ /dev/null @@ -1,7 +0,0 @@ -# dave@sleepmap.de (default) -set spoolfile = "+dave@sleepmap.de/INBOX" -source "~/.mutt/dave@sleepmap.de.rc" -folder-hook dave@sleepmap.de/* source ~/.mutt/dave@sleepmap.de.rc - -# dvzrv@archlinux.org -folder-hook dvzrv@archlinux.org/* source ~/.mutt/dvzrv@archlinux.org.rc diff --git a/.mutt/attachments.rc b/.mutt/attachments.rc deleted file mode 100644 index 693f174..0000000 --- a/.mutt/attachments.rc +++ /dev/null @@ -1,2 +0,0 @@ -set mime_forward=yes -set mime_forward_rest=yes diff --git a/.mutt/color.rc b/.mutt/color.rc deleted file mode 100644 index b413dca..0000000 --- a/.mutt/color.rc +++ /dev/null @@ -1,84 +0,0 @@ -# Colors for items in the index -color index brightcyan default ~N -color index brightred default ~O -color index brightyellow default ~F -color index black green ~T -color index brightred default ~D -mono index bold ~N -mono index bold ~F -mono index bold ~T -mono index bold ~D - -# Highlights inside the body of a message. - -# URLs -color body brightgreen default "(http|ftp|news|telnet|finger)://[^ \"\t\r\n]*" -color body brightgreen default "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+" -mono body bold "(http|ftp|news|telnet|finger)://[^ \"\t\r\n]*" -mono body bold "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+" - -# Email addresses. -color body brightgreen default "[-a-z_0-9.%$]+@[-a-z_0-9.]+\\.[-a-z][-a-z]+" - -# Header -color header green default "^from:" -color header green default "^to:" -color header green default "^cc:" -color header green default "^date:" -color header yellow default "^newsgroups:" -color header yellow default "^reply-to:" -color header brightcyan default "^subject:" -color header red default "^x-spam-rule:" -color header green default "^x-mailer:" -color header yellow default "^message-id:" -color header yellow default "^Organization:" -color header yellow default "^Organisation:" -color header yellow default "^User-Agent:" -color header yellow default "^message-id: .*pine" -color header yellow default "^X-Fnord:" -color header yellow default "^X-WebTV-Stationery:" - -color header red default "^x-spam-rule:" -color header green default "^x-mailer:" -color header yellow default "^message-id:" -color header yellow default "^Organization:" -color header yellow default "^Organisation:" -color header yellow default "^User-Agent:" -color header yellow default "^message-id: .*pine" -color header yellow default "^X-Fnord:" -color header yellow default "^X-WebTV-Stationery:" -color header yellow default "^X-Message-Flag:" -color header yellow default "^X-Spam-Status:" -color header yellow default "^X-SpamProbe:" -color header red default "^X-SpamProbe: SPAM" - -# Coloring quoted text - coloring the first 7 levels: -color quoted cyan default -color quoted1 yellow default -color quoted2 red default -color quoted3 green default -color quoted4 cyan default -color quoted5 yellow default -color quoted6 red default -color quoted7 green default - -# Default color definitions -#color hdrdefault white green -color signature brightmagenta default -color indicator black cyan -color attachment black green -color error red default -color message white default -color search brightwhite magenta -color status brightyellow blue -color tree brightblue default -color normal white default -color tilde green default -color bold brightyellow default -color underline magenta default -color markers brightcyan default - -# Color definitions when on a mono screen -mono bold bold -mono underline underline -mono indicator reverse diff --git a/.mutt/dave@sleepmap.de.rc b/.mutt/dave@sleepmap.de.rc deleted file mode 100644 index 402f92f..0000000 --- a/.mutt/dave@sleepmap.de.rc +++ /dev/null @@ -1,12 +0,0 @@ -set from = "David Runge " -set sendmail = "/usr/bin/msmtp -a sleepmap.de" -set folder = "~/.mail/dave@sleepmap.de" -set spoolfile = "+INBOX" -set postponed = "+Drafts" -set record = "+Sent" -set realname = "David Runge" -set signature = "~/.mutt/dave@sleepmap.de.sig" -set pgp_default_key = '1793DAD5D803A8FFD7451697BB992F9864FAD168' - -color status green default - diff --git a/.mutt/dave@sleepmap.de.sig b/.mutt/dave@sleepmap.de.sig deleted file mode 100644 index b50b097..0000000 --- a/.mutt/dave@sleepmap.de.sig +++ /dev/null @@ -1 +0,0 @@ -https://sleepmap.de diff --git a/.mutt/default.rc b/.mutt/default.rc deleted file mode 100644 index 48156bd..0000000 --- a/.mutt/default.rc +++ /dev/null @@ -1,11 +0,0 @@ -set editor=`echo \$EDITOR` -set folder = "~/.mail" -set mbox_type = Maildir - -set date_format = "%F %T (%Z)" -set index_format = "%4C %D %Z %-15.15L (%?l?%4l&%4c?) %s" -set folder_format = "%2C %N %2l %-8.8u %-8.8g %8s %d %f" -set send_charset="utf-8" - -auto_view text/html # view html automatically -alternative_order text/plain text/enriched text/html # save html for last diff --git a/.mutt/dvzrv@archlinux.org.rc b/.mutt/dvzrv@archlinux.org.rc deleted file mode 100644 index ab6ce25..0000000 --- a/.mutt/dvzrv@archlinux.org.rc +++ /dev/null @@ -1,12 +0,0 @@ -set from = "David Runge " -set sendmail = "/usr/bin/msmtp -a archlinux.org" -set folder = "~/.mail/dvzrv@archlinux.org" -set spoolfile = "+INBOX" -set postponed = "+Drafts" -set record = "+Sent" -set realname = "David Runge" -set signature = "~/.mutt/dvzrv@archlinux.org.sig" -set pgp_default_key = 'C7E7849466FE2358343588377258734B41C31549' - -color status green default - diff --git a/.mutt/dvzrv@archlinux.org.sig b/.mutt/dvzrv@archlinux.org.sig deleted file mode 100644 index 23af390..0000000 --- a/.mutt/dvzrv@archlinux.org.sig +++ /dev/null @@ -1 +0,0 @@ -https://archlinux.org diff --git a/.mutt/gpg.rc b/.mutt/gpg.rc deleted file mode 100644 index 502de7b..0000000 --- a/.mutt/gpg.rc +++ /dev/null @@ -1,17 +0,0 @@ -set pgp_good_sign="^gpg: Good signature from " -set pgp_use_gpg_agent = yes -set pgp_self_encrypt = yes -set pgp_default_key = '1793DAD5D803A8FFD7451697BB992F9864FAD168' -set pgp_timeout = 60 -set pgp_verify_command = "gpg --batch --output - --verify %s %f" -set crypt_use_gpgme = yes -set crypt_autosign = yes -set crypt_replyencrypt = yes -set crypt_replysignencrypted = yes -set crypt_protected_headers_write = yes - -# add message-hook for non standard-compliant (old) gnupg style messages -message-hook '!(~g|~G) ~b"^-----BEGIN\ PGP\ (SIGNED\ )?MESSAGE"' "exec check-traditional-pgp" - -send-hook . 'reset crypt_autoencrypt' -source "~/.mutt/gpg-auto.rc" diff --git a/.mutt/khard.rc b/.mutt/khard.rc deleted file mode 100644 index 12c9b39..0000000 --- a/.mutt/khard.rc +++ /dev/null @@ -1,5 +0,0 @@ -# auto-completing mails when pressing tab in "new mail" dialog using khard address books -set query_command= "khard email -p -s last_name -d first_name %s" -bind editor complete-query -bind editor ^T complete - diff --git a/.mutt/macros.rc b/.mutt/macros.rc deleted file mode 100644 index 83dd9d0..0000000 --- a/.mutt/macros.rc +++ /dev/null @@ -1,49 +0,0 @@ - -# source folder settings and enter folder -macro index,pager 'source ~/.mutt/dave@sleepmap.de.rc!' -macro index,pager 'source ~/.mutt/dvzrv@archlinux.org.rc!' - -macro attach W \ - "~/Downloads/" \ - "Save attachment to ~/Downloads." - -macro index D \ - "+Trash" \ - "Move message to Trash" - -macro index S \ - "+Spam" \ - "Move message to Spam." - -macro index I \ - "=Archives/INBOX/2020" \ - "Archive tagged INBOX message(s) in Archives.INBOX.2020" - -macro index G \ - "=Archives/Sent/2020" \ - "Archive tagged Sent message(s) in Archives.Sent.2020" - -macro index,pager A \ - "khard add-email" \ - "Add the sender email address to khard" - -macro index \ - "set my_old_pipe_decode=\$pipe_decode my_old_wait_key=\$wait_key nopipe_decode nowait_key\ - notmuch-mutt -r --prompt search\ - `echo ${XDG_CACHE_HOME:-$HOME/.cache}/notmuch/mutt/results`\ - set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key" \ - "notmuch: search mail" - -macro index \ - "set my_old_pipe_decode=\$pipe_decode my_old_wait_key=\$wait_key nopipe_decode nowait_key\ - notmuch-mutt -r thread\ - `echo ${XDG_CACHE_HOME:-$HOME/.cache}/notmuch/mutt/results`\ - set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key" \ - "notmuch: reconstruct thread" - -macro index \ - "set my_old_pipe_decode=\$pipe_decode my_old_wait_key=\$wait_key nopipe_decode nowait_key\ - notmuch-mutt tag -- -inbox\ - set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key" \ - "notmuch: remove message from inbox" - diff --git a/.mutt/muttrc b/.mutt/muttrc deleted file mode 100644 index f990e46..0000000 --- a/.mutt/muttrc +++ /dev/null @@ -1,32 +0,0 @@ -# defaults -source "~/.mutt/default.rc" - -# color -source "~/.mutt/color.rc" - -# gnupg -source "~/.mutt/gpg.rc" - -# mailboxes (set by offlineimap) -source "~/.mutt/mailboxes.rc" - -# sorting -source "~/.mutt/sorting.rc" - -# attachments -source "~/.mutt/attachments.rc" - -# khard (contacts) -source "~/.mutt/khard.rc" - -# accounts -source "~/.mutt/accounts.rc" - -# macros -source "~/.mutt/macros.rc" - -# security -source "~/.mutt/security.rc" - -# sidebar -source "~/.mutt/sidebar.rc" diff --git a/.mutt/security.rc b/.mutt/security.rc deleted file mode 100644 index af00478..0000000 --- a/.mutt/security.rc +++ /dev/null @@ -1,2 +0,0 @@ -# disable enter-command (so password commands won't show up in command history) -bind generic,alias,attach,browser,editor,index,compose,pager,pgp,postpone ':' noop diff --git a/.mutt/sidebar.rc b/.mutt/sidebar.rc deleted file mode 100644 index c3c130c..0000000 --- a/.mutt/sidebar.rc +++ /dev/null @@ -1,14 +0,0 @@ -set browser_abbreviate_mailboxes = no -set sidebar_visible = yes -set sidebar_folder_indent = yes -set sidebar_short_path = yes -set sidebar_width = 30 - -macro index b 'toggle sidebar_visible' -macro pager b 'toggle sidebar_visible' - -# Ctrl-n, Ctrl-p to select next, previous folder. -# Ctrl-o to open selected folder. -bind index,pager \CP sidebar-prev -bind index,pager \CN sidebar-next -bind index,pager \CO sidebar-open diff --git a/.mutt/sorting.rc b/.mutt/sorting.rc deleted file mode 100644 index 48827f7..0000000 --- a/.mutt/sorting.rc +++ /dev/null @@ -1,2 +0,0 @@ -set sort = "threads" -set sort_aux = "last-date-received" -- cgit v1.2.3-54-g00ecf