From b35bc9d391f1dea7ae8ab4f8c49ad9ae84cb2a92 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Tue, 5 Mar 2024 13:23:05 +0100 Subject: [PATCH 1/3] Use lynx instead of w3m --- .mailcap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mailcap b/.mailcap index f29f032..5e40229 100644 --- a/.mailcap +++ b/.mailcap @@ -1,6 +1,6 @@ # mailcap - MIME configuration file -text/html; w3m -T text/html '%s' +text/html; lynx -dump -assume_charset=utf-8 -display_charset=utf-8 -force_html '%s'; copiousoutput text/html; w3m -T text/html -dump '%s'; copiousoutput text/*; cat; copiousoutput; edit=$VISUAL %s From 5e92d1b14ce22d1b077abb1c4f732f4b5e58716e Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Tue, 5 Mar 2024 13:35:13 +0100 Subject: [PATCH 2/3] Update muttrc --- .muttrc | 295 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 176 insertions(+), 119 deletions(-) diff --git a/.muttrc b/.muttrc index 58d5e49..57c73de 100644 --- a/.muttrc +++ b/.muttrc @@ -1,79 +1,50 @@ -set mbox_type=Maildir -set folder="~/.mail" -set mask="!^\\.[^.]" -set record="+.Sent" -set postponed="+.Drafts" -set spoolfile="~/.mail" +set spoolfile = imaps://seshat.pomail.fr/INBOX +set imap_user = nemunaire +set imap_passive="no" +set imap_check_subscribed="yes" +set imap_list_subscribed="yes" -auto_view text/html -alternative_order text/plain text text/enriched text/html +set smtp_url = smtps://$imap_user@thot.pomail.fr +set smtp_pass = $imap_pass + +set mask="!^\\.[^.]" +folder-hook . set record="+.Sent" +set postponed="+.Drafts" # Set the desired default "from" address for both header From and envelope-from set reverse_name -set from="nemunaire@nemunai.re" -alternates "nemunaire@pomail.fr|nemu@pomail.fr|pom@pomail.fr|pompom@pomail.fr|pierreolivier@pomail.fr|pierre-olivier@pomail.fr|.+@pommail.fr|.+@mercier.pm|.+@p0m.fr|.+@nemunai.re|nemunaire@epita.fr|mercie_d@epita.fr|pierreolivier.mercier@epita.fr|pomercier@novaquark.com" +folder-hook . set from="nemunaire@nemunai.re" +alternates "nemunaire@pomail.fr|nemu@pomail.fr|pom@pomail.fr|pierreolivier@pomail.fr|pierre-olivier@pomail.fr|pierre-olivier@happydns.org|nemunaire@happydns.org|pierre-olivier.mercier@happydns.org|pierre-olivier@happydomain.org|nemunaire@happydomain.org|pierre-olivier.mercier@happydomain.org|nemunaire@epita.fr|mercie_d@epita.fr|pierreolivier.mercier@epita.fr|pierre-olivier.mercier@epita.fr|parava@pomail.fr" set realname="Pierre-Olivier Mercier" set hostname="nemunai.re" set envelope_from=yes set use_domain=no -set alias_file= ~/.mutt/aliases -set sort_alias= alias -set reverse_alias=yes -source $alias_file - -source ~/.mutt/mls - -set dsn_notify="failure,delay" - -# set up the sidebar -set sidebar_width=25 -set sidebar_visible=yes -set sidebar_sort=yes - -mailboxes ! `find ~/.mail -maxdepth 1 -type d -name ".*" -printf "+'%f' "` - -macro index c "?" "open a different folder" -macro pager c "?" "open a different folder" - -macro index C "?" "copy a message to a mailbox" -macro index M "?" "move a message to a mailbox" -macro pager C "?" "copy a message to a mailbox" -macro pager M "?" "move a message to a mailbox" -macro pager D "~/scripts/dmarc-parser.pl" "move a message to a mailbox" - -macro compose A "?" "attach message(s) to this message" - -# Include folder hooks defining Fcc -source ~/.mutt/folder-hooks - -#GPG -set fcc_clear # Keep fcc's clear of signatues and encryption. -source ~/.mutt/gpg.rc -set pgp_sign_as="0x4573CC96" - -set pgp_autosign -set pgp_replysign -set pgp_replyencrypt -set pgp_replysignencrypted -set pgp_verify_sig=yes -set pgp_strict_enc -set pgp_use_gpg_agent=yes +set mail_check_stats +#set beep_new +# character set on sent messages set send_charset="us-ascii:utf-8" +# if there is no character set given on incoming messages, it is probably windows +set assumed_charset="iso-8859-1" -# -set header_cache = ~/.mutt/cache -set header_cache_pagesize = 32768 -set maildir_header_cache_verify = no +# make sure Vim knows Mutt is a mail client and that a UTF-8 encoded message will be composed +set editor="vim -c 'set tw=72 syntax=mail ft=mail enc=utf-8'" -# locales FR pour les nom des jours et mois -set locale="fr_FR" -set date_format="%A %d %b %Y à %H:%M:%S (%Z)" -set attribution="Le %d, %n a écrit :" -set mime_forward # Forward message as MIME attachments. +# we want to see some MIME types inline, see below this code listing for explanation +auto_view text/html +alternative_order text/plain text text/enriched text/html -# Header stuff +# make default search pattern to search in To, Cc and Subject +set simple_search="~f %s | ~C %s | ~s %s" + +# threading preferences, sort by threads +set sort=threads +set strict_threads=yes +set sort_aux=date-received +#set sort_browser=date + +# do not show all headers, just a few #ignore "Authentication-Results:" #ignore "DomainKey-Signature:" #ignore "DKIM-Signature:" @@ -88,32 +59,113 @@ unignore x-mailer: x-url reply-to unignore user-agent: unignore Saved-In: +# use headercache (make sure this is a directory for better performance!) +set header_cache = ~/.mutt/cache +#set header_cache_pagesize = 32768 +#set maildir_header_cache_verify = no + +# set up the sidebar +set sidebar_divider_char='│' +set sidebar_format = '%B%?F? [%F]?%* %?N?%N?' +set sidebar_folder_indent +set sidebar_visible +set sidebar_sort_method=path +set sidebar_short_path + +# make the progress updates not that expensive, this will update the bar every 300ms +set read_inc = 1 +set time_inc = 300 + +set dsn_return=hdrs +set dsn_notify="failure,delay" + +set auto_tag + +# includes only the first attachment of the message you are replying +set include_onlyfirst +#set mime_forward # Forward message as MIME attachments. + # For better looks #set arrow_cursor #set folder_format="%t%N %-30.30f %8s" #set index_format="%4C %Z %{%b %d} %-31.31F %N (%4c) %s" -set beep_new -set menu_scroll -set smart_wrap = yes +set menu_scroll # just scroll one line instead of full page set nomarkers # don't put '+' at the beginning of wrapped lines set pager_index_lines = 7 # how large is the index window? -set sort = 'threads' -set sort_aux=date-received -#set sort_browser=date - -# My Editor -set editor="vim '+set tw=72'" - -set config_charset=utf8 -set charset="utf-8" - set pager_stop +set date_format="%A %d %b %Y à %H:%M:%S (%Z)" +set attribution="Le %d, %n a écrit :" + +# Aliases +set alias_file= ~/.mutt/aliases +set sort_alias= alias +set reverse_alias=yes +source $alias_file + # ===================================================================== -# Normal colors +# Custom bindings # ===================================================================== -color normal white black -color message white black + +macro index,pager c "?" "open a different folder" +macro index,pager C "?" "copy a message to a mailbox" +macro index,pager M "?" "move a message to a mailbox" +macro pager D "~/scripts/dmarc-parser.pl" "parse attached DMARC report" +macro pager \ei "~/.mutt/readical.py" "parse attached iCal" +macro pager T "~/scripts/tlsrpt-report-display.pl" "parse attached SMTP-TLS report" +#macro pager V "~/workspace/peret/check.py --students-list /home/nemunaire/workspace/peret/SRS2023.csv --real-send --review-before-send --skip-max-submission --skip-public-key --submissions '/home/nemunaire/workspace/virli/rendus/project3'" "rerun peret checker script for VIRLI" +macro pager V "~/workspace/peret/check.py --students-list /home/nemunaire/workspace/peret/SRS2023.csv --real-send --review-before-send --skip-max-submission --skip-public-key --submissions '/home/nemunaire/workspace/adlin/rendus/TP2'" "rerun peret checker script for ADLIN" +#macro pager V "~/workspace/peret/check.py --students-list /home/nemunaire/workspace/peret/SRS2023.csv --real-send --review-before-send --skip-max-submission --sign" "rerun peret checker script for VIRLI" +macro pager \eV "~/workspace/peret/check.py --students-list /home/nemunaire/workspace/peret/SRS2023.csv --real-send --review-before-send --sign" "rerun peret checker script for signcheck" + +macro compose A "?" "attach message(s) to this message" + +bind index ' ' tag-entry +macro index,pager \eL 'imaps://seshat.pomail.fr/Lost' +#macro index,pager \eV '=.Epita.SRS.virli/' +bind index,pager \CP sidebar-page-up +#bind index,pager \CI sidebar-page-down +bind index,pager \CO sidebar-open +bind index,pager i sidebar-next +macro index,pager I '' +bind index,pager o sidebar-open +bind index,pager p sidebar-prev +macro index,pager P '' +bind index,pager B bounce-message + +# b toggles sidebar visibility +bind index,pager b sidebar-toggle-visible + +# Remap bounce-message function to "B" +bind index B bounce-message +bind index,pager \e next-unread-mailbox + + +# ===================================================================== +# PGP +# ===================================================================== + +set crypt_use_gpgme = yes +# you can set this to hide gpg's verification output and only rely on Mutt's status flag +#set crypt_display_signature = no +# enable signing of emails by default +folder-hook . set pgp_autosign +#set pgp_replysign +#set pgp_replyencrypt +#set pgp_replysignencrypted +#set pgp_use_gpg_agent = yes +folder-hook . set pgp_sign_as = 0x842807A84573CC96 + +# Keep fcc's clear of signatues and encryption. +set fcc_clear + + +# ===================================================================== +# Colors +# ===================================================================== + +color normal white default +color message white default color signature magenta default color hdrdefault cyan default color attachment yellow default @@ -125,17 +177,14 @@ color tree brightwhite default # thread tree in the index menu color body brightblue default "(git|ssh|ftp|http)s?://[^ ]+" # point out URLs color body brightblue default [-a-z_0-9.]+@[-a-z_0-9.]+ # e-mail addresses - -# ===================================================================== # Index -# ===================================================================== #color index color248 default "~A" # Unread messages in yellow -color index cyan default "~t $from" +color index cyan default "~t nemunaire@nemunai.re" color index brightyellow default "~N|~O" -color index brightcyan default "~t $from (~N|~O)" +color index brightcyan default "~t nemunaire@nemunai.re (~N|~O)" # Messages already replied to in green color index green default "~Q" @@ -147,10 +196,14 @@ color index color237 default "~D" color index brightred default "~F" color index magenta default "~T" +# Compose +color compose header yellow default +color compose security_none red default +color compose security_encrypt magenta default +color compose security_sign cyan default +color compose security_both green default -# ===================================================================== -# Header -# ===================================================================== +# Headers # Color information about the sender color header brightcyan default "From: " @@ -170,9 +223,7 @@ color header yellow default "Authentication-Results:.*dmarc=quarantine" color header red default "Authentication-Results:.*dmarc=reject" -# ===================================================================== # Body -# ===================================================================== # Color the first levels of quoted text color quoted green default @@ -181,46 +232,52 @@ color quoted2 green default color quoted3 cyan default # Sidebar colors +color sidebar_divider cyan default color sidebar_new yellow default color sidebar_flagged brightred default -bind index ' ' tag-entry -macro index,pager \eL '=.Lost/' -#macro index,pager \eV '=.Epita.SRS.virli/' -bind index,pager \CP sidebar-scroll-up -#bind index,pager \CI sidebar-scroll-down -bind index,pager \CO sidebar-open -bind index,pager i sidebar-next -macro index,pager I '' -bind index,pager o sidebar-open -bind index,pager p sidebar-prev -macro index,pager P '' -bind index,pager B bounce-message - -# b toggles sidebar visibility -macro index,pager b 'toggle sidebar_visible' - -# Remap bounce-message function to "B" -bind index B bounce-message -bind index,pager \e next-unread-mailbox - -# GnuPG output -# +# GnuPG output ######################################################## # Make if very obvious there is a bad signature! -color body black red "^gpg: BAD signature .*$" -color body black red "^gpg: MAUVAISE signature .*$" +color body default red "^gpg: BAD signature .*$" +color body default red "^gpg: MAUVAISE signature .*$" # Tag a good signature -color body brightgreen black "^gpg: Good signature .*$" -color body brightgreen black "^gpg: Bonne signature .*$" +color body brightgreen default "^gpg: Good signature .*$" +color body brightgreen default "^gpg: Bonne signature .*$" +color body green default "^gpg: Good signature .*unknown]" +color body green default "^gpg: Bonne signature .*inconnu]" # Inform the signature can't be verified -color body brightred black "^gpg: Can't check signature: public key not found" -color body brightred black "^gpg: Impossible de v.*" -color body brightred black "^gpg: WARNING: .*!" -color body brightred black "^gpg: ATTENTION: .*!" -color body brightred black "^gpg: some signal caught ... exiting" +color body brightred default "^gpg: Can't check signature: public key not found" +color body brightred default "^gpg: Impossible de v.*" +color body brightred default "^gpg: WARNING: .*" +color body brightred default "^gpg: Attention: .*" +color body red default "^gpg: .*ette clef n'est pas certifiée avec une signature de confiance." +color body red default "^gpg: .*ien n'indique que la signature appartient à son propriétaire." +color body brightred default "^gpg: some signal caught ... exiting" #Messages color error brightwhite red # error messages color message brightblack green # status messages + + +# ===================================================================== +# Hooks +# ===================================================================== + +source ~/.mutt/folder-hooks +folder-hook ".Appart" set from="pierre-olivier@pomail.fr" +folder-hook ".Appart" unset pgp_autosign +folder-hook ".Appart" unset pgp_sign_as + +folder-hook ".Business.happyDomain" set from="nemunaire@happydomain.org" +folder-hook ".Business.happyDomain" unset pgp_autosign +folder-hook ".Business.happyDomain" unset pgp_sign_as + +folder-hook ".Epita" set from="pierre-olivier.mercier@epita.fr" +folder-hook ".Epita" unset pgp_autosign +folder-hook ".Epita" unset pgp_sign_as + +folder-hook ".Epita.SRS" set from="nemunaire@nemunai.re" +folder-hook ".Epita.SRS" set pgp_autosign +folder-hook ".Epita.SRS" set pgp_sign_as From 61544ec9693178b364bc0f8cec5934f77afd9d45 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Tue, 5 Mar 2024 13:37:17 +0100 Subject: [PATCH 3/3] Update rdesktop config --- .rdesktop/keymaps/us-intl | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) mode change 120000 => 100644 .rdesktop/keymaps/us-intl diff --git a/.rdesktop/keymaps/us-intl b/.rdesktop/keymaps/us-intl deleted file mode 120000 index 8544fc8..0000000 --- a/.rdesktop/keymaps/us-intl +++ /dev/null @@ -1 +0,0 @@ -en-intl \ No newline at end of file diff --git a/.rdesktop/keymaps/us-intl b/.rdesktop/keymaps/us-intl new file mode 100644 index 0000000..3126a21 --- /dev/null +++ b/.rdesktop/keymaps/us-intl @@ -0,0 +1,35 @@ +# generated from XKB map us +include common +map 0x20409 +exclam 0x02 shift +at 0x03 shift +numbersign 0x04 shift +dollar 0x05 shift +percent 0x06 shift +asciicircum 0x07 shift +ampersand 0x08 shift +asterisk 0x09 shift +parenleft 0x0a shift +parenright 0x0b shift +minus 0x0c +underscore 0x0c shift +equal 0x0d +plus 0x0d shift +bracketleft 0x1a +braceleft 0x1a shift +bracketright 0x1b +braceright 0x1b shift +semicolon 0x27 +colon 0x27 shift +apostrophe 0x28 +quotedbl 0x28 shift +grave 0x29 +asciitilde 0x29 shift +backslash 0x2b +bar 0x2b shift +comma 0x33 +less 0x33 shift +period 0x34 +greater 0x34 shift +slash 0x35 +question 0x35 shift