From 8fb837d2a35673f03463969700ba6313ca7e9478 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Sat, 23 Jul 2022 05:52:15 +0200 Subject: update mutt, omz update --- home/.config/neomutt/muttrc | 50 ++++++++++++++---------------- home/.gitconfig | 2 ++ home/.mutt/muttrc | 27 +--------------- home/var/system/config-updater/post-update | 2 ++ 4 files changed, 28 insertions(+), 53 deletions(-) diff --git a/home/.config/neomutt/muttrc b/home/.config/neomutt/muttrc index 44ccf74..cc5e42f 100644 --- a/home/.config/neomutt/muttrc +++ b/home/.config/neomutt/muttrc @@ -186,36 +186,27 @@ color body cyan default "[-a-z_0-9.+]+@[-a-z_0-9.]+" # email addresses color body red default "(^| )\\*[-a-z0-9*]+\\*[,.?]?[ \n]" color body green default "(^| )_[-a-z0-9_]+_[,.?]?[ \n]" -color index green default ~O # Old +color index color162 default ~O # Old color index brightgreen default ~N # New -color index yellow default ~F # Flagged +color index brightyellow default ~F # Flagged color index magenta default ~T # Tagged color index red default ~D # Deleted -# attributes when using a mono terminal -mono index bold ~N -mono index bold ~F -mono index bold ~T -mono index bold ~D -mono normal none # normal text -mono indicator reverse # actual message -mono tree none # thread arrows -mono status reverse # status line -mono error bold # errors -mono message none # info messages -mono quoted bold # quoted text -mono signature none # signature -mono attachment underline # MIME attachments -mono search reverse # search matches -mono tilde none # ~ at bottom of msg -mono markers bold # + at beginning of wrapped lines -mono hdrdefault none # default header lines -mono bold bold # hiliting bold patterns in body -mono underline underline # hiliting underlined patterns in body +color index_date color110 default -## pgp -mono body bold "^gpg: Good signature" -mono body bold "^gpg: BAD signature from.*" +color index_author color182 default '.*' +color index_author magenta default ~T +color index_author color162 default ~O +color index_author color162 default ~N +color index_author brightyellow default ~F # Flagged +color index_author red default ~D # Deleted + +color index_subject default default '.*' +color index_subject magenta default ~T +color index_subject color162 default ~O +color index_subject color162 default ~N +color index_subject brightyellow default ~F # Flagged +color index_subject red default ~D # Deleted # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # @@ -240,7 +231,12 @@ bind generic { top-page bind generic } bottom-page bind generic \177 last-entry -macro index \cb " urlview" # simulate the old browse-url function +# simulate the old url menu +macro index,pager,attach,compose \cb "\ + set my_pipe_decode=\$pipe_decode pipe_decode\ + urlview\ + set pipe_decode=\$my_pipe_decode; unset my_pipe_decode" \ +"call urlview to extract URLs out of a message" bind editor complete-query bind editor ^T complete @@ -380,7 +376,7 @@ auto_view text/html # but this will render all html, we only want to autoview it when we don't have # text/plain: -alternative_order text/enriched text/plain text +alternative_order text/plain text/enriched text/html text/* # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # diff --git a/home/.gitconfig b/home/.gitconfig index 7986183..c35fe89 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -1,6 +1,7 @@ [alias] dc = describe --contains lg = log --all --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --abbrev-commit + wdiff = diff --word-diff [branch] autosetuprebase = always @@ -47,5 +48,6 @@ [user] email = astra@ionic.at name = David Kaufmann + [init] defaultBranch = master diff --git a/home/.mutt/muttrc b/home/.mutt/muttrc index 56a88d9..ee0fc1a 100644 --- a/home/.mutt/muttrc +++ b/home/.mutt/muttrc @@ -192,31 +192,6 @@ color index yellow default ~F # Flagged color index magenta default ~T # Tagged color index red default ~D # Deleted -# attributes when using a mono terminal -mono index bold ~N -mono index bold ~F -mono index bold ~T -mono index bold ~D -mono normal none # normal text -mono indicator reverse # actual message -mono tree none # thread arrows -mono status reverse # status line -mono error bold # errors -mono message none # info messages -mono quoted bold # quoted text -mono signature none # signature -mono attachment underline # MIME attachments -mono search reverse # search matches -mono tilde none # ~ at bottom of msg -mono markers bold # + at beginning of wrapped lines -mono hdrdefault none # default header lines -mono bold bold # hiliting bold patterns in body -mono underline underline # hiliting underlined patterns in body - -## pgp -mono body bold "^gpg: Good signature" -mono body bold "^gpg: BAD signature from.*" - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # # Key bindings @@ -385,7 +360,7 @@ auto_view text/html # but this will render all html, we only want to autoview it when we don't have # text/plain: -alternative_order text/plain text/enriched text/html text +alternative_order text/plain text/enriched text/html text/* # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # diff --git a/home/var/system/config-updater/post-update b/home/var/system/config-updater/post-update index ae77cf5..70be0fc 100644 --- a/home/var/system/config-updater/post-update +++ b/home/var/system/config-updater/post-update @@ -14,3 +14,5 @@ rm -f .zshrc.pre-oh-my-zsh [ -r .Xresources ] && echo "f919d32723cee7cbae00718131fbe703 .Xresources" | md5sum --check --status && rm -f .Xresources [ -r .zshrc.local ] && echo "8bcb00aa4de816bd158584f84feb3de2 .zshrc.local" | md5sum --check --status && rm -f .zshrc.local # END removed files from git e3fb79a...6c7ef44 (2020-03-22) + +omz update -- cgit v1.2.3