dot

packages and services management
Log | Files | Refs | README

commit 6c6a8d3db233c33da93c3ab354ffc7a8240b0b9b
parent 73b02e8a086e18ee8645a3651610a4ed18304da9
Author: josuah <mail@josuah.net>
Date:   Thu, 29 Dec 2016 19:55:11 +0100

Updated mailx configuration file

Diffstat:
M.local/bin/music-rename | 2+-
M.local/bin/version | 25++++++++++---------------
M.mailrc | 105+++++++++++++++++++++++++++++++++++--------------------------------------------
3 files changed, 58 insertions(+), 74 deletions(-)

diff --git a/.local/bin/music-rename b/.local/bin/music-rename @@ -6,7 +6,7 @@ transform() { s|([^[:alnum:]][[:digit:]]+) - |\1--|g s| - |/|g s|&|and|g - s|[^[:alnum:],./-]|-|g + s|[ '\''"$#*?\\^_~`]|-|g ' | tr -d '|[[]{}()<>*$' } diff --git a/.local/bin/version b/.local/bin/version @@ -114,20 +114,6 @@ makediff() { printf '\n\n: %s %s\n\n' "$1" "$2" - # i: identical: same hash and same name - comm -12 "$3/.version/$1" "$3/.version/$2" | sed 's/^/i /' - - # m: modified: same name, different content - comm -3 "$3/.version/$1" "$3/.version/$2" | sed 's/^\t//' | - sort -b -t "$NL" -k 1.35 | uniq -ds 34 | sed 's/^/m /' - - # r: renamed: same hash, different name - comm -3 "$3/.version/$1" "$3/.version/$2" | sed 's/^\t//' | - while read -r hash name - do - grep -F "$hash" "$3/.version/$1" | sed 's/^/r /' - done - # d: deleted: neither name nor hash present in the next revision while read -r hash name do @@ -147,6 +133,15 @@ makediff() # +# transform create / delete into rename / edit +# +reducediff() +{ + true +} + + +# # 1: 2: revisions between which generate each diff # 3: root of the tree for which make a diff # @@ -206,4 +201,4 @@ main() } -main "$@" | less -F +main "$@" | less -FR~ diff --git a/.mailrc b/.mailrc @@ -1,9 +1,4 @@ -# mailx configuration file 2016-11-28 -# -# __ _ . | _ _ -# ||| (_| | | | (_ -# -#_______________________________________________________________________________ +# mailx configuration file set sendmail="~/.local/sbin/ssmtp" @@ -12,8 +7,7 @@ set hold set keepsave -# Display -#_______________________________________________________________________________ +# display ---------------------------------------------------------------------- # Do not send output to pager under this number of line, and also add colours if set crt colour-pager @@ -28,8 +22,7 @@ set datefield="%R %m-%d" datefield-markout-older=" %g-%m-%d" #set prompt="\033[1m\?\$ \@>\033[0m " -# Composing -#_______________________________________________________________________________ +# composing -------------------------------------------------------------------- # Automatically quote the text of the message that is responded to. set quote @@ -51,8 +44,7 @@ set ask set editalong -# Headline -#_______________________________________________________________________________ +# headline --------------------------------------------------------------------- set headline="%>%a %m %-f %11d %i%-s" @@ -90,8 +82,7 @@ set showname set showto -# Commands -#_______________________________________________________________________________ +# commands --------------------------------------------------------------------- # Only include these selected header fields when forwarding messages fwdretain subject date from to @@ -100,8 +91,7 @@ fwdretain subject date from to retain date from to cc subject message-id mail-followup-to reply-to -# Attachments -#_______________________________________________________________________________ +# attachments ------------------------------------------------------------------ # HTML as text, inline display via w3m set pipe-text/html="w3m -dump" @@ -116,73 +106,72 @@ set pipe-application/html="tee > \ #uncollapse -# Macros -#_______________________________________________________________________________ +# macros ---------------------------------------------------------------------- define filter { - # Mailing lists + # mailing lists - move (from "lobste.rs") ~/Mail/lobsters + move (from "lobste.rs") ~/mail/lobsters - move (from "reddit") ~/Mail/reddit + move (from "reddit") ~/mail/reddit - move (from "disqus") ~/Mail/disqus + move (from "disqus") ~/mail/disqus - move (from "nixers.net") ~/Mail/nixers + move (from "nixers.net") ~/mail/nixers - move (from "sachachua.com") ~/Mail/sachachua + move (from "sachachua.com") ~/mail/sachachua - move (cc "mmh@marmaro.de") ~/Mail/mmh - move (to "mmh@marmaro.de") ~/Mail/mmh + move (cc "mmh@marmaro.de") ~/mail/mmh + move (to "mmh@marmaro.de") ~/mail/mmh - move (from "suckless.org") ~/Mail/suckless - move (to "suckless.org") ~/Mail/suckless - move (cc "suckless.org") ~/Mail/suckless + move (from "suckless.org") ~/mail/suckless + move (to "suckless.org") ~/mail/suckless + move (cc "suckless.org") ~/mail/suckless - move (from "fsf.org") ~/Mail/fsf + move (from "fsf.org") ~/mail/fsf - move (to "listes.etudiant.univ-rennes1.fr") ~/Mail/univ-rennes1 - move (header List-Id "foad.univ-rennes1.fr") ~/Mail/univ-rennes1 - move (header Received "vmsympa1.univ-rennes1.fr") ~/Mail/univ-rennes1 - move (header Return-Path "listes.univ-rennes1.fr") ~/Mail/univ-rennes1 + move (to "listes.etudiant.univ-rennes1.fr") ~/mail/univ-rennes1 + move (header List-Id "foad.univ-rennes1.fr") ~/mail/univ-rennes1 + move (header Received "vmsympa1.univ-rennes1.fr") ~/mail/univ-rennes1 + move (header Return-Path "listes.univ-rennes1.fr") ~/mail/univ-rennes1 - move (header List-Id "breizh-entropy.org") ~/Mail/breizh-entropy + move (header List-Id "breizh-entropy.org") ~/mail/breizh-entropy - move (subject "[repo.or.cz]") ~/Mail/repo.or.cz + move (subject "[repo.or.cz]") ~/mail/repo.or.cz - move (from "github.com") ~/Mail/github + move (from "github.com") ~/mail/github - move (from "stackexchange.com") ~/Mail/stackexchange + move (from "stackexchange.com") ~/mail/stackexchange - move (from "twitter.com") ~/Mail/twitter + move (from "twitter.com") ~/mail/twitter - move (from "bandcamp.com") ~/Mail/bandcamp - move (from "Cryo Chamber") ~/Mail/bandcamp + move (from "bandcamp.com") ~/mail/bandcamp + move (from "Cryo Chamber") ~/mail/bandcamp - move (from "keybase.io") ~/Mail/keybase + move (from "keybase.io") ~/mail/keybase - move (from "wordpress.com") ~/Mail/wordpress + move (from "wordpress.com") ~/mail/wordpress - move (from "google.com") ~/Mail/google + move (from "google.com") ~/mail/google - move (from "@free-mobile.fr") ~/Mail/utilities + move (from "@free-mobile.fr") ~/mail/utilities - move (from "@paypal") ~/Mail/payment - move (from "coinbase.com") ~/Mail/payment + move (from "@paypal") ~/mail/payment + move (from "coinbase.com") ~/mail/payment - move (from "gandi.net") ~/Mail/webservices + move (from "gandi.net") ~/mail/webservices - move (from "@amazon") ~/Mail/webstores + move (from "@amazon") ~/mail/webstores - move (from "crous-rennes.fr") ~/Mail/housing + move (from "crous-rennes.fr") ~/mail/housing - move (from "sncf.com") ~/Mail/transports - move (from "captaintrain.com") ~/Mail/transports - move (from "flixbus") ~/Mail/transports - move (from "megabus") ~/Mail/transports - move (from "ouigo") ~/Mail/transports - move (from "ouibus") ~/Mail/transports - move (from "keolis.com") ~/Mail/transports - move (from "BlaBlaCar") ~/Mail/transports + move (from "sncf.com") ~/mail/transports + move (from "captaintrain.com") ~/mail/transports + move (from "flixbus") ~/mail/transports + move (from "megabus") ~/mail/transports + move (from "ouigo") ~/mail/transports + move (from "ouibus") ~/mail/transports + move (from "keolis.com") ~/mail/transports + move (from "BlaBlaCar") ~/mail/transports }