From a17e7fc1348378ff4867d8a215b9dc59203d92b1 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Tue, 25 Oct 2022 19:51:42 +0200 Subject: [PATCH 1/5] [mail] fix: check new-ness against $timestamp --- .local/bin/mailsync | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.local/bin/mailsync b/.local/bin/mailsync index 112e199..7cb2231 100755 --- a/.local/bin/mailsync +++ b/.local/bin/mailsync @@ -13,6 +13,8 @@ # and the GPG home. This is done by searching common profile files for variable # assignments. +timestamp="${XDG_STATE_HOME:-$HOME/.local/state}/mailsynclastrun" + eval "$(grep -h -- \ "^\s*\(export \)\?\(XDG_CACHE_HOME\|XDG_CONFIG_HOME\|XDG_DATA_HOME\)=" \ "$HOME/.zshenv" 2>/dev/null)" @@ -37,7 +39,7 @@ notify() { syncandnotify() { acc="$(echo "$account" | sed "s/.*\///")" mbsync "$acc" - new="$(find "${XDG_DATA_HOME:-$HOME/.local/share}"/mail/$acc -path */new/* -type f | grep -iv -e "trash" -e "drafts" 2>/dev/null)" + new="$(find "${XDG_DATA_HOME:-$HOME/.local/share}"/mail/$acc -path */new/* -type f -newer "$timestamp" | grep -iv -e "trash" -e "drafts" 2>/dev/null)" newcount=$(echo "$new" | sed '/^\s*$/d' | wc -l) if [ "$newcount" -gt "0" ]; then notify "$acc" "$newcount" & @@ -57,4 +59,4 @@ wait notmuch new 2>/dev/null #Create a touch file that indicates the time of the last run of mailsync -touch "${XDG_STATE_HOME:-$HOME/.local/state}/mailsynclastrun" +touch $timestamp From 45930f277b374ce90c026c8c1d2303e3eed7a880 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sat, 29 Oct 2022 21:24:16 +0200 Subject: [PATCH 2/5] [nvim] fix: contrast for light colorscheme --- .local/src/astronomy.nvim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.local/src/astronomy.nvim b/.local/src/astronomy.nvim index 41edd2a..ab28bc5 160000 --- a/.local/src/astronomy.nvim +++ b/.local/src/astronomy.nvim @@ -1 +1 @@ -Subproject commit 41edd2a8502cc6d3be9ad18387e8b3c67d2dd4c3 +Subproject commit ab28bc593b1e6e6a37d7ee4582f8aa1bac8f1ca6 From 094bc994f2a49243dc11a52c3a8ecbe021bcf9fc Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sat, 29 Oct 2022 16:23:06 +0200 Subject: [PATCH 3/5] [mail] refactor: divide neomuttrc into file + dir name change --- .config/mutt/muttrc | 7 - .config/mutt/neomutt.muttrc | 167 ------------------ .../accounts/1-david.julien@posteo.net.muttrc | 6 +- .../2-david.julien@ens-lyon.fr.muttrc | 6 +- .../2-david.julien@etu.univ-lyon1.fr.muttrc | 42 +++++ .../2-david.julien@univ-nantes.fr.muttrc | 6 +- .../accounts/3-david.julien@mailo.com.muttrc | 6 +- ...-david.julien@centrale-marseille.fr.muttrc | 6 +- .../accounts/account_template.muttrc | 6 +- .../{mutt => neomutt}/accounts/ens.signature | 0 .../accounts/mailo.signature | 0 .../accounts/nantes.signature | 0 .../accounts/posteo.signature | 0 .config/neomutt/colors | 73 ++++++++ .config/{mutt => neomutt}/mailcap | 0 .config/neomutt/maps | 73 ++++++++ .config/{mutt => neomutt}/muttrc.template | 0 .config/neomutt/neomuttrc | 36 ++++ 18 files changed, 243 insertions(+), 191 deletions(-) delete mode 100644 .config/mutt/muttrc delete mode 100644 .config/mutt/neomutt.muttrc rename .config/{mutt => neomutt}/accounts/1-david.julien@posteo.net.muttrc (89%) rename .config/{mutt => neomutt}/accounts/2-david.julien@ens-lyon.fr.muttrc (92%) create mode 100644 .config/neomutt/accounts/2-david.julien@etu.univ-lyon1.fr.muttrc rename .config/{mutt => neomutt}/accounts/2-david.julien@univ-nantes.fr.muttrc (93%) rename .config/{mutt => neomutt}/accounts/3-david.julien@mailo.com.muttrc (92%) rename .config/{mutt => neomutt}/accounts/4-david.julien@centrale-marseille.fr.muttrc (88%) rename .config/{mutt => neomutt}/accounts/account_template.muttrc (91%) rename .config/{mutt => neomutt}/accounts/ens.signature (100%) rename .config/{mutt => neomutt}/accounts/mailo.signature (100%) rename .config/{mutt => neomutt}/accounts/nantes.signature (100%) rename .config/{mutt => neomutt}/accounts/posteo.signature (100%) create mode 100644 .config/neomutt/colors rename .config/{mutt => neomutt}/mailcap (100%) create mode 100644 .config/neomutt/maps rename .config/{mutt => neomutt}/muttrc.template (100%) create mode 100644 .config/neomutt/neomuttrc diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc deleted file mode 100644 index 072ca89..0000000 --- a/.config/mutt/muttrc +++ /dev/null @@ -1,7 +0,0 @@ -# vim: filetype=neomuttrc -source $XDG_CONFIG_HOME/mutt/neomutt.muttrc -macro index,pager ip 'source $XDG_CONFIG_HOME/mutt/accounts/1-david.julien@posteo.net.muttrc!;' "switch to david.julien@posteo.net" -macro index,pager is 'source $XDG_CONFIG_HOME/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc!;' "switch to david.julien@ens-lyon.fr" -macro index,pager in 'source $XDG_CONFIG_HOME/mutt/accounts/2-david.julien@univ-nantes.fr.muttrc!;' "switch to david.julien@univ-nantes.fr" -macro index,pager im 'source $XDG_CONFIG_HOME/mutt/accounts/3-david.julien@mailo.com.muttrc!;' "switch to david.julien@mailto.com" -source $XDG_CONFIG_HOME/mutt/accounts/2-david.julien@univ-nantes.fr.muttrc diff --git a/.config/mutt/neomutt.muttrc b/.config/mutt/neomutt.muttrc deleted file mode 100644 index 8191acd..0000000 --- a/.config/mutt/neomutt.muttrc +++ /dev/null @@ -1,167 +0,0 @@ -# vim: filetype=neomuttrc -# Adapted from Luke Smith's mutt-wizard config files. -# More information : https://github.com/LukeSmithxyz/mutt-wizard - - -set mailcap_path = $XDG_CONFIG_HOME/mutt/mailcap:$mailcap_path -set mime_type_query_command = "file --mime-type -b %s" -set date_format="%d/%m/%y %I:%M%p" -set index_format="%2C %Z %?X?A& ? %D %-15.15F %s (%-4.4c)" -set sort = 'reverse-date' -set smtp_authenticators = 'gssapi:login' -set my_abook = "abook --config $XDG_CONFIG_HOME/abook/abookrc --datafile \ - $XDG_DATA_HOME/abook/addressbook" -set query_command = "$my_abook --mutt-query '%s'" -set rfc2047_parameters = yes -set sleep_time = 0 # Pause 0 seconds for informational messages -set markers = no # Disables the `+` displayed at line wraps -set mark_old = no # Unread mail stay unread until read -set mime_forward = yes # attachments are forwarded with mail -set wait_key = no # mutt won't ask "press key to continue" -set fast_reply # skip to compose when replying -set fcc_attach # save attachments with the body -set forward_format = "Fwd: %s" # format of subject when forwarding -set forward_quote # include message in forwards -set reverse_name # reply as whomever it was to -set include # include message in replies -set mail_check=60 # to avoid lags using IMAP with some email providers (yahoo for example) -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 -bind index,pager i noop -bind index,pager g noop -bind index \Cf noop - -# General rebindings -bind index j next-entry -bind index k previous-entry -bind attach view-mailcap -bind attach l view-mailcap -bind editor noop -bind index G last-entry -bind index gg first-entry -bind pager,attach h exit -bind pager j next-line -bind pager k previous-line -bind pager l view-attachments -bind index D delete-message -bind index U undelete-message -bind index L limit -bind index h noop -bind index l display-message -bind index,query tag-entry -#bind browser h goto-parent -macro browser h '..' "Go to parent folder" -bind index,pager H view-raw-message -bind browser l select-entry -bind pager,browser gg top-page -bind pager,browser G bottom-page -bind index,pager,browser d half-down -bind index,pager,browser u half-up -bind index,pager S sync-mailbox -bind index,pager R group-reply -bind index \031 previous-undeleted # Mouse wheel -bind index \005 next-undeleted # Mouse wheel -bind pager \031 previous-line # Mouse wheel -bind pager \005 next-line # Mouse wheel -bind editor complete-query - -#set crypt_autosign = yes -#set crypt_opportunistic_encrypt = yes -#set pgp_self_encrypt = yes -#set pgp_default_key = 'your@gpgemailaddre.ss' - -macro index,pager a "set my_pipe_decode=\$pipe_decode pipe_decode$my_abook --add-emailset pipe_decode=\$my_pipe_decode; unset my_pipe_decode" "add the sender address to my_abook" -macro index \Cr "T~UN." "mark all messages as read" -macro index O "mbsync -a" "run mbsync -a to sync all mail" -macro index \Cf "unset wait_keyprintf 'Enter a search term to find with notmuch: '; read x; echo \$x >~/.cache/mutt_terms~i \"\`notmuch search --output=messages \$(cat ~/.cache/mutt_terms) | head -n 600 | perl -le '@a=<>;s/\^id:// for@a;$,=\"|\";print@a' | perl -le '@a=<>; chomp@a; s/\\+/\\\\+/ for@a;print@a' \`\"" "show only messages matching a notmuch pattern" -macro index A "all\n" "show all messages (undo limit)" - -# Sidebar mappings -set sidebar_visible = yes -set sidebar_width = 20 -set sidebar_short_path -set sidebar_folder_indent -set sidebar_indent_string = " └ " -set sidebar_next_new_wrap = yes -set mail_check_stats -set sidebar_format = '%D%?F? [%F]?%* %?N?%N/? %?S?%S?' -bind index,pager \Ck sidebar-prev -bind index,pager \Cj sidebar-next -bind index,pager \Co sidebar-open -bind index,pager \Cp sidebar-prev-new -bind index,pager \Cn sidebar-next-new -bind index,pager B sidebar-toggle-visible - -# Default index colors: -color index yellow default '.*' -color index_author red default '.*' -color index_number blue default -color index_subject cyan default '.*' - -# New mail is boldened: -color index brightyellow black "~N" -color index_author brightred black "~N" -color index_subject brightcyan black "~N" - -# Tagged mail is highlighted: -color index brightyellow blue "~T" -color index_author brightred blue "~T" -color index_subject brightcyan blue "~T" - -# Other colors and aesthetic settings: -mono bold bold -mono underline underline -mono indicator reverse -mono error bold -color normal default default -color indicator brightblack white -color sidebar_highlight red default -color sidebar_divider brightblack black -color sidebar_flagged red black -color sidebar_new green black -color normal brightyellow default -color error red default -color tilde black default -color message cyan default -color markers red white -color attachment white default -color search brightmagenta default -color status brightyellow black -color hdrdefault brightgreen default -color quoted green default -color quoted1 blue default -color quoted2 cyan default -color quoted3 yellow default -color quoted4 red default -color quoted5 brightred default -color signature brightgreen default -color bold black default -color underline black default -color normal default default - -# Regex highlighting: -color header blue default ".*" -color header brightmagenta default "^(From)" -color header brightcyan default "^(Subject)" -color header brightwhite default "^(CC|BCC)" -color body brightred default "[\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+" # Email addresses -color body brightblue default "(https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+" # URL -color body green default "\`[^\`]*\`" # Green text between ` and ` -color body brightblue default "^# \.*" # Headings as bold blue -color body brightcyan default "^## \.*" # Subheadings as bold cyan -color body brightgreen default "^### \.*" # Subsubheadings as bold green -color body yellow default "^(\t| )*(-|\\*) \.*" # List items as yellow -color body brightcyan default "[;:][-o][)/(|]" # emoticons -color body brightcyan default "[;:][)(|]" # emoticons -color body brightcyan default "[ ][*][^*]*[*][ ]?" # more emoticon? -color body brightcyan default "[ ]?[*][^*]*[*][ ]" # more emoticon? -color body red default "(BAD signature)" -color body cyan default "(Good signature)" -color body brightblack default "^gpg: Good signature .*" -color body brightyellow default "^gpg: " -color body brightyellow red "^gpg: BAD signature from.*" -mono body bold "^gpg: Good signature" -mono body bold "^gpg: BAD signature from.*" -color body red default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]" diff --git a/.config/mutt/accounts/1-david.julien@posteo.net.muttrc b/.config/neomutt/accounts/1-david.julien@posteo.net.muttrc similarity index 89% rename from .config/mutt/accounts/1-david.julien@posteo.net.muttrc rename to .config/neomutt/accounts/1-david.julien@posteo.net.muttrc index c81d1a9..d9adf49 100644 --- a/.config/mutt/accounts/1-david.julien@posteo.net.muttrc +++ b/.config/neomutt/accounts/1-david.julien@posteo.net.muttrc @@ -5,8 +5,8 @@ set from = "david.julien@posteo.net" set sendmail = "msmtp -a david.julien@posteo.net" alias me david.julien set folder = "$XDG_DATA_HOME/mail/david.julien@posteo.net" -set header_cache = "$XDG_CACHE_HOME/mutt/david.julien@posteo.net/headers" -set message_cachedir = "$XDG_CACHE_HOME/mutt/david.julien@posteo.net/bodies" +set header_cache = "$XDG_CACHE_HOME/neomutt/david.julien@posteo.net/headers" +set message_cachedir = "$XDG_CACHE_HOME/neomutt/david.julien@posteo.net/bodies" set mbox_type = Maildir set crypt_autosign = yes @@ -20,7 +20,7 @@ bind index,pager C noop bind index gg first-entry unmailboxes * unalternates * -set signature="$XDG_CONFIG_HOME/mutt/accounts/posteo.signature" +set signature="$XDG_CONFIG_HOME/neomutt/accounts/posteo.signature" unmacro index o macro index o "mailsync" "run mbsync to sync david.julien@posteo.net" diff --git a/.config/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc b/.config/neomutt/accounts/2-david.julien@ens-lyon.fr.muttrc similarity index 92% rename from .config/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc rename to .config/neomutt/accounts/2-david.julien@ens-lyon.fr.muttrc index 7c00a8f..6edfdff 100644 --- a/.config/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc +++ b/.config/neomutt/accounts/2-david.julien@ens-lyon.fr.muttrc @@ -5,8 +5,8 @@ set from = "david.julien@ens-lyon.fr" set sendmail = "msmtp -a david.julien@ens-lyon.fr" alias me david.julien set folder = "$XDG_DATA_HOME/mail/david.julien@ens-lyon.fr" -set header_cache = "$XDG_CACHE_HOME/mutt/david.julien@ens-lyon.fr/headers" -set message_cachedir = "$XDG_CACHE_HOME/mutt/david.julien@ens-lyon.fr/bodies" +set header_cache = "$XDG_CACHE_HOME/neomutt/david.julien@ens-lyon.fr/headers" +set message_cachedir = "$XDG_CACHE_HOME/neomutt/david.julien@ens-lyon.fr/bodies" set mbox_type = Maildir set crypt_autosign = yes @@ -20,7 +20,7 @@ bind index,pager C noop bind index gg first-entry unmailboxes * unalternates * -set signature="$XDG_CONFIG_HOME/mutt/accounts/ens.signature" +set signature="$XDG_CONFIG_HOME/neomutt/accounts/ens.signature" unmacro index o macro index o "mailsync" "run mbsync to sync david.julien@ens-lyon.fr" diff --git a/.config/neomutt/accounts/2-david.julien@etu.univ-lyon1.fr.muttrc b/.config/neomutt/accounts/2-david.julien@etu.univ-lyon1.fr.muttrc new file mode 100644 index 0000000..9351c4d --- /dev/null +++ b/.config/neomutt/accounts/2-david.julien@etu.univ-lyon1.fr.muttrc @@ -0,0 +1,42 @@ +# vim: filetype=neomuttrc +# muttrc file for account david.julien@etu.univ-lyon1.fr +set realname = "David JULIEN" +set from = "david.julien@etu.univ-lyon1.fr" +set sendmail = "msmtp -a david.julien@etu.univ-lyon1.fr" +alias me david.julien +set folder = "/home/swytch/.local/share/mail/david.julien@etu.univ-lyon1.fr" +set header_cache = /home/swytch/.cache +eomutt/david.julien@etu.univ-lyon1.fr/headers +set message_cachedir = /home/swytch/.cache +eomutt/david.julien@etu.univ-lyon1.fr/bodies +set mbox_type = Maildir + + +bind index,pager gg noop +bind index,pager g noop +bind index,pager M noop +bind index,pager C noop +bind index gg first-entry +unmailboxes * +unalternates * +unset signature +unmacro index o +macro index o "mw -y david.julien@etu.univ-lyon1.fr" "run mbsync to sync david.julien@etu.univ-lyon1.fr" + +mailboxes "=Sent Items" "=Drafts" "=Trash" "=INBOX" +set record = "+Sent Items" +macro index,pager gs "=Sent Items" "go to sent" +macro index,pager Ms ";=Sent Items" "move mail to sent" +macro index,pager Cs ";=Sent Items" "copy mail to sent" +set postponed = "+Drafts" +macro index,pager gd "=Drafts" "go to drafts" +macro index,pager Md ";=Drafts" "move mail to drafts" +macro index,pager Cd ";=Drafts" "copy mail to drafts" +macro index,pager gt "=Trash" "go to trash" +macro index,pager Mt ";=Trash" "move mail to trash" +macro index,pager Ct ";=Trash" "copy mail to trash" +set trash = "+Trash" +macro index,pager gi "=INBOX" "go to inbox" +macro index,pager Mi ";=INBOX" "move mail to inbox" +macro index,pager Ci ";=INBOX" "copy mail to inbox" +set spoolfile = "+INBOX" diff --git a/.config/mutt/accounts/2-david.julien@univ-nantes.fr.muttrc b/.config/neomutt/accounts/2-david.julien@univ-nantes.fr.muttrc similarity index 93% rename from .config/mutt/accounts/2-david.julien@univ-nantes.fr.muttrc rename to .config/neomutt/accounts/2-david.julien@univ-nantes.fr.muttrc index cc03a40..2970bb4 100644 --- a/.config/mutt/accounts/2-david.julien@univ-nantes.fr.muttrc +++ b/.config/neomutt/accounts/2-david.julien@univ-nantes.fr.muttrc @@ -5,8 +5,8 @@ set from = "david.julien@univ-nantes.fr" set sendmail = "msmtp -a david.julien@univ-nantes.fr" alias me david.julien set folder = "$XDG_DATA_HOME/mail/david.julien@univ-nantes.fr" -set header_cache = "$XDG_CACHE_HOME/mutt/david.julien@univ-nantes.fr/headers" -set message_cachedir = "$XDG_CACHE_HOME/mutt/david.julien@univ-nantes.fr/bodies" +set header_cache = "$XDG_CACHE_HOME/neomutt/david.julien@univ-nantes.fr/headers" +set message_cachedir = "$XDG_CACHE_HOME/neomutt/david.julien@univ-nantes.fr/bodies" set mbox_type = Maildir set crypt_autosign = yes @@ -20,7 +20,7 @@ bind index,pager C noop bind index gg first-entry unmailboxes * unalternates * -set signature="$XDG_CONFIG_HOME/mutt/accounts/nantes.signature" +set signature="$XDG_CONFIG_HOME/neomutt/accounts/nantes.signature" unmacro index o macro index o "mailsync" "run mbsync to sync david.julien@univ-nantes.fr" diff --git a/.config/mutt/accounts/3-david.julien@mailo.com.muttrc b/.config/neomutt/accounts/3-david.julien@mailo.com.muttrc similarity index 92% rename from .config/mutt/accounts/3-david.julien@mailo.com.muttrc rename to .config/neomutt/accounts/3-david.julien@mailo.com.muttrc index 779517e..74acbd5 100644 --- a/.config/mutt/accounts/3-david.julien@mailo.com.muttrc +++ b/.config/neomutt/accounts/3-david.julien@mailo.com.muttrc @@ -5,8 +5,8 @@ set from = "david.julien@mailo.com" set sendmail = "msmtp -a david.julien@mailo.com" alias me david.julien set folder = "$XDG_DATA_HOME/mail/david.julien@mailo.com" -set header_cache = "$XDG_CACHE_HOME/mutt/david.julien@mailo.com/headers" -set message_cachedir = "$XDG_CACHE_HOME/mutt/david.julien@mailo.com/bodies" +set header_cache = "$XDG_CACHE_HOME/neomutt/david.julien@mailo.com/headers" +set message_cachedir = "$XDG_CACHE_HOME/neomutt/david.julien@mailo.com/bodies" set mbox_type = Maildir set crypt_autosign = yes @@ -20,7 +20,7 @@ bind index,pager C noop bind index gg first-entry unmailboxes * unalternates * -set signature="$XDG_CONFIG_HOME/mutt/accounts/mailo.signature" +set signature="$XDG_CONFIG_HOME/neomutt/accounts/mailo.signature" unmacro index o macro index o "mailsync" "run mbsync to sync david.julien@mailo.com" diff --git a/.config/mutt/accounts/4-david.julien@centrale-marseille.fr.muttrc b/.config/neomutt/accounts/4-david.julien@centrale-marseille.fr.muttrc similarity index 88% rename from .config/mutt/accounts/4-david.julien@centrale-marseille.fr.muttrc rename to .config/neomutt/accounts/4-david.julien@centrale-marseille.fr.muttrc index a521c78..287f743 100644 --- a/.config/mutt/accounts/4-david.julien@centrale-marseille.fr.muttrc +++ b/.config/neomutt/accounts/4-david.julien@centrale-marseille.fr.muttrc @@ -5,8 +5,8 @@ set from = "david.julien@centrale-marseille.fr" set sendmail = "msmtp -a david.julien@centrale-marseille.fr" alias me david.julien set folder = "$XDG_DATA_HOME/mail/david.julien@centrale-marseille.fr" -set header_cache = "$XDG_CACHE_HOME/mutt/david.julien@centrale-marseille.fr/headers" -set message_cachedir = "$XDG_CACHE_HOME/mutt/david.julien@centrale-marseille.fr/bodies" +set header_cache = "$XDG_CACHE_HOME/neomutt/david.julien@centrale-marseille.fr/headers" +set message_cachedir = "$XDG_CACHE_HOME/neomutt/david.julien@centrale-marseille.fr/bodies" set mbox_type = Maildir set crypt_autosign = no @@ -20,7 +20,7 @@ bind index,pager C noop bind index gg first-entry unmailboxes * unalternates * -set signature="$XDG_CONFIG_HOME/mutt/accounts/centrale.signature" +set signature="$XDG_CONFIG_HOME/neomutt/accounts/centrale.signature" unmacro index o macro index o "mailsync" "run mbsync to sync david.julien@centrale-marseille.fr" diff --git a/.config/mutt/accounts/account_template.muttrc b/.config/neomutt/accounts/account_template.muttrc similarity index 91% rename from .config/mutt/accounts/account_template.muttrc rename to .config/neomutt/accounts/account_template.muttrc index 3d92c26..24730ea 100644 --- a/.config/mutt/accounts/account_template.muttrc +++ b/.config/neomutt/accounts/account_template.muttrc @@ -5,8 +5,10 @@ set from = "email@adress.you" set sendmail = "msmtp -a email@adress.you" alias me david.julien set folder = "/home/johndoe/.local/share/mail/email@adress.you" -set header_cache = /home/johndoe/.cache/mutt/email@adress.you/headers -set message_cachedir = /home/johndoe/.cache/mutt/email@adress.you/bodies +set header_cache = /home/johndoe/.cache +eomutt/email@adress.you/headers +set message_cachedir = /home/johndoe/.cache +eomutt/email@adress.you/bodies set mbox_type = Maildir diff --git a/.config/mutt/accounts/ens.signature b/.config/neomutt/accounts/ens.signature similarity index 100% rename from .config/mutt/accounts/ens.signature rename to .config/neomutt/accounts/ens.signature diff --git a/.config/mutt/accounts/mailo.signature b/.config/neomutt/accounts/mailo.signature similarity index 100% rename from .config/mutt/accounts/mailo.signature rename to .config/neomutt/accounts/mailo.signature diff --git a/.config/mutt/accounts/nantes.signature b/.config/neomutt/accounts/nantes.signature similarity index 100% rename from .config/mutt/accounts/nantes.signature rename to .config/neomutt/accounts/nantes.signature diff --git a/.config/mutt/accounts/posteo.signature b/.config/neomutt/accounts/posteo.signature similarity index 100% rename from .config/mutt/accounts/posteo.signature rename to .config/neomutt/accounts/posteo.signature diff --git a/.config/neomutt/colors b/.config/neomutt/colors new file mode 100644 index 0000000..9b13b9d --- /dev/null +++ b/.config/neomutt/colors @@ -0,0 +1,73 @@ +# vim: filetype=neomuttrc +# +# Default index colors: +color index yellow default '.*' +color index_author red default '.*' +color index_number blue default +color index_subject cyan default '.*' + +# New mail is boldened: +color index brightyellow black "~N" +color index_author brightred black "~N" +color index_subject brightcyan black "~N" + +# Tagged mail is highlighted: +color index brightyellow blue "~T" +color index_author brightred blue "~T" +color index_subject brightcyan blue "~T" + +# Other colors and aesthetic settings: +mono bold bold +mono underline underline +mono indicator reverse +mono error bold +color normal default default +color indicator brightblack white +color sidebar_highlight red default +color sidebar_divider brightblack black +color sidebar_flagged red black +color sidebar_new green black +color normal brightyellow default +color error red default +color tilde black default +color message cyan default +color markers red white +color attachment white default +color search brightmagenta default +color status brightyellow black +color hdrdefault brightgreen default +color quoted green default +color quoted1 blue default +color quoted2 cyan default +color quoted3 yellow default +color quoted4 red default +color quoted5 brightred default +color signature brightgreen default +color bold black default +color underline black default +color normal default default + +# Regex highlighting: +color header blue default ".*" +color header brightmagenta default "^(From)" +color header brightcyan default "^(Subject)" +color header brightwhite default "^(CC|BCC)" +color body brightred default "[\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+" # Email addresses +color body brightblue default "(https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+" # URL +color body green default "\`[^\`]*\`" # Green text between ` and ` +color body brightblue default "^# \.*" # Headings as bold blue +color body brightcyan default "^## \.*" # Subheadings as bold cyan +color body brightgreen default "^### \.*" # Subsubheadings as bold green +color body yellow default "^(\t| )*(-|\\*) \.*" # List items as yellow +color body brightcyan default "[;:][-o][)/(|]" # emoticons +color body brightcyan default "[;:][)(|]" # emoticons +color body brightcyan default "[ ][*][^*]*[*][ ]?" # more emoticon? +color body brightcyan default "[ ]?[*][^*]*[*][ ]" # more emoticon? +color body red default "(BAD signature)" +color body cyan default "(Good signature)" +color body brightblack default "^gpg: Good signature .*" +color body brightyellow default "^gpg: " +color body brightyellow red "^gpg: BAD signature from.*" +mono body bold "^gpg: Good signature" +mono body bold "^gpg: BAD signature from.*" +color body red default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]" diff --git a/.config/mutt/mailcap b/.config/neomutt/mailcap similarity index 100% rename from .config/mutt/mailcap rename to .config/neomutt/mailcap diff --git a/.config/neomutt/maps b/.config/neomutt/maps new file mode 100644 index 0000000..3df953c --- /dev/null +++ b/.config/neomutt/maps @@ -0,0 +1,73 @@ +# vim: filetype=neomuttrc + +bind index,pager i noop +bind index,pager g noop +bind index \Cf noop + +# Switching accounts +macro index,pager ip 'source $XDG_CONFIG_HOME/neomutt/accounts/1-david.julien@posteo.net.muttrc!;' "switch to david.julien@posteo.net" +macro index,pager is 'source $XDG_CONFIG_HOME/neomutt/accounts/2-david.julien@ens-lyon.fr.muttrc!;' "switch to david.julien@ens-lyon.fr" +macro index,pager in 'source $XDG_CONFIG_HOME/neomutt/accounts/2-david.julien@univ-nantes.fr.muttrc!;' "switch to david.julien@univ-nantes.fr" +macro index,pager im 'source $XDG_CONFIG_HOME/neomutt/accounts/3-david.julien@mailo.com.muttrc!;' "switch to david.julien@mailo.com" + +# General rebindings +bind index j next-entry +bind index k previous-entry +bind attach view-mailcap +bind attach l view-mailcap +bind editor noop +bind index G last-entry +bind index gg first-entry +bind pager,attach h exit +bind pager j next-line +bind pager k previous-line +bind pager l view-attachments +bind index D delete-message +bind index U undelete-message +bind index L limit +bind index h noop +bind index l display-message +bind index,query tag-entry +#bind browser h goto-parent +macro browser h '..' "Go to parent folder" +bind index,pager H view-raw-message +bind browser l select-entry +bind pager,browser gg top-page +bind pager,browser G bottom-page +bind index,pager,browser d half-down +bind index,pager,browser u half-up +bind index,pager S sync-mailbox +bind index,pager R group-reply +bind index \031 previous-undeleted # Mouse wheel +bind index \005 next-undeleted # Mouse wheel +bind pager \031 previous-line # Mouse wheel +bind pager \005 next-line # Mouse wheel +bind editor complete-query + +#set crypt_autosign = yes +#set crypt_opportunistic_encrypt = yes +#set pgp_self_encrypt = yes +#set pgp_default_key = 'your@gpgemailaddre.ss' + +macro index,pager a "set my_pipe_decode=\$pipe_decode pipe_decode$my_abook --add-emailset pipe_decode=\$my_pipe_decode; unset my_pipe_decode" "add the sender address to my_abook" +macro index \Cr "T~UN." "mark all messages as read" +macro index O "mbsync -a" "run mbsync -a to sync all mail" +macro index \Cf "unset wait_keyprintf 'Enter a search term to find with notmuch: '; read x; echo \$x >~/.cache/neomutt_terms~i \"\`notmuch search --output=messages \$(cat ~/.cache/neomutt_terms) | head -n 600 | perl -le '@a=<>;s/\^id:// for@a;$,=\"|\";print@a' | perl -le '@a=<>; chomp@a; s/\\+/\\\\+/ for@a;print@a' \`\"" "show only messages matching a notmuch pattern" +macro index A "all\n" "show all messages (undo limit)" + +# Sidebar mappings +set sidebar_visible = yes +set sidebar_width = 20 +set sidebar_short_path +set sidebar_folder_indent +set sidebar_indent_string = " └ " +set sidebar_next_new_wrap = yes +set mail_check_stats +set sidebar_format = '%D%?F? [%F]?%* %?N?%N/? %?S?%S?' +bind index,pager \Ck sidebar-prev +bind index,pager \Cj sidebar-next +bind index,pager \Co sidebar-open +bind index,pager \Cp sidebar-prev-new +bind index,pager \Cn sidebar-next-new +bind index,pager B sidebar-toggle-visible + diff --git a/.config/mutt/muttrc.template b/.config/neomutt/muttrc.template similarity index 100% rename from .config/mutt/muttrc.template rename to .config/neomutt/muttrc.template diff --git a/.config/neomutt/neomuttrc b/.config/neomutt/neomuttrc new file mode 100644 index 0000000..480a7eb --- /dev/null +++ b/.config/neomutt/neomuttrc @@ -0,0 +1,36 @@ +# vim: filetype=neomuttrc +# Adapted from Luke Smith's mutt-wizard config files. +# More information : https://github.com/LukeSmithxyz/mutt-wizard + + +set mailcap_path = $XDG_CONFIG_HOME/neomutt/mailcap:$mailcap_path +set mime_type_query_command = "file --mime-type -b %s" +set date_format="%d/%m/%y %I:%M%p" +set index_format="%2C %Z %?X?A& ? %D %-15.15F %s (%-4.4c)" +set sort = 'reverse-date' +set smtp_authenticators = 'gssapi:login' +set my_abook = "abook --config $XDG_CONFIG_HOME/abook/abookrc --datafile \ + $XDG_DATA_HOME/abook/addressbook" +set query_command = "$my_abook --mutt-query '%s'" +set rfc2047_parameters = yes +set sleep_time = 0 # Pause 0 seconds for informational messages +set markers = no # Disables the `+` displayed at line wraps +set mark_old = no # Unread mail stay unread until read +set mime_forward = yes # attachments are forwarded with mail +set wait_key = no # mutt won't ask "press key to continue" +set fast_reply # skip to compose when replying +set fcc_attach # save attachments with the body +set forward_format = "Fwd: %s" # format of subject when forwarding +set forward_quote # include message in forwards +set reverse_name # reply as whomever it was to +set include # include message in replies +set mail_check=60 # to avoid lags using IMAP with some email providers (yahoo for example) +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 + + +source $XDG_CONFIG_HOME/neomutt/maps +source $XDG_CONFIG_HOME/neomutt/colors +source $XDG_CONFIG_HOME/neomutt/accounts/2-david.julien@univ-nantes.fr.muttrc From 0005eff8a26b6499e587df10e9eb5571b40107bb Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sun, 30 Oct 2022 23:18:53 +0100 Subject: [PATCH 4/5] [status] fix: show volume when muted --- .local/bin/statusbar/sb-volume | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.local/bin/statusbar/sb-volume b/.local/bin/statusbar/sb-volume index b7b0c08..eda4ae2 100755 --- a/.local/bin/statusbar/sb-volume +++ b/.local/bin/statusbar/sb-volume @@ -9,16 +9,19 @@ # @description : volume block for dwmblocks ###################################################################### -[ "1" = $(pulsemixer --get-mute) ] && echo " 婢 --- " && exit vol="$(pulsemixer --get-volume | awk -F " " '{ printf "%d", $1 }')" -if [ "$vol" -gt "70" ]; then - icon="墳" -elif [ "$vol" -lt "30" ]; then - icon="奄" +if [ "1" = $(pulsemixer --get-mute) ]; then + icon="婢" else - icon="奔" + if [ "$vol" -gt "70" ]; then + icon="墳" + elif [ "$vol" -lt "30" ]; then + icon="奄" + else + icon="奔" + fi fi printf " %s %3d%% " $icon $vol From de5d6d68dfe4c18061b50cdfa503258af0b4d00a Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sun, 30 Oct 2022 23:23:32 +0100 Subject: [PATCH 5/5] [mail] cleanup: remove unused accounts !!!BREAKING: remove lyon1 and centrale-marseille accounts --- .config/mbsync/config | 26 ----------- .config/msmtp/config | 12 ----- .../2-david.julien@etu.univ-lyon1.fr.muttrc | 42 ----------------- ...-david.julien@centrale-marseille.fr.muttrc | 46 ------------------- .local/bin/statusbar/sb-mailbox | 1 - 5 files changed, 127 deletions(-) delete mode 100644 .config/neomutt/accounts/2-david.julien@etu.univ-lyon1.fr.muttrc delete mode 100644 .config/neomutt/accounts/4-david.julien@centrale-marseille.fr.muttrc diff --git a/.config/mbsync/config b/.config/mbsync/config index 0b14d53..38741eb 100644 --- a/.config/mbsync/config +++ b/.config/mbsync/config @@ -75,29 +75,3 @@ SyncState * MaxMessages 0 ExpireUnread no # End Profile - -# Centrale -IMAPStore david.julien@centrale-marseille.fr-remote -Host imaps.centrale-marseille.fr -Port 993 -User djulien -PassCmd "pass centrale-marseille.fr/djulien" -AuthMechs LOGIN -SSLType IMAPS -CertificateFile /etc/ssl/certs/ca-certificates.crt - -MaildirStore david.julien@centrale-marseille.fr-local -Subfolders Verbatim -Path /home/swytch/.local/share/mail/david.julien@centrale-marseille.fr/ -Inbox /home/swytch/.local/share/mail/david.julien@centrale-marseille.fr/INBOX - -Channel david.julien@centrale-marseille.fr -Expunge Both -Far :david.julien@centrale-marseille.fr-remote: -Near :david.julien@centrale-marseille.fr-local: -Patterns * !"[Gmail]/All Mail" -Create Both -SyncState * -MaxMessages 0 -ExpireUnread no -# End Profile diff --git a/.config/msmtp/config b/.config/msmtp/config index 438caed..25ea415 100644 --- a/.config/msmtp/config +++ b/.config/msmtp/config @@ -30,15 +30,3 @@ auth on tls on tls_trust_file /etc/ssl/certs/ca-certificates.crt logfile /home/swytch/.config/msmtp/msmtp.log - -account david.julien@centrale-marseille.fr -host smtp.centrale-marseille.fr -port 587 -from david.julien@centrale-marseille.fr -user djulien -passwordeval "pass centrale-marseille.fr/djulien" -auth on -tls on -tls_trust_file /etc/ssl/certs/ca-certificates.crt -logfile /home/swytch/.config/msmtp/msmtp.log - diff --git a/.config/neomutt/accounts/2-david.julien@etu.univ-lyon1.fr.muttrc b/.config/neomutt/accounts/2-david.julien@etu.univ-lyon1.fr.muttrc deleted file mode 100644 index 9351c4d..0000000 --- a/.config/neomutt/accounts/2-david.julien@etu.univ-lyon1.fr.muttrc +++ /dev/null @@ -1,42 +0,0 @@ -# vim: filetype=neomuttrc -# muttrc file for account david.julien@etu.univ-lyon1.fr -set realname = "David JULIEN" -set from = "david.julien@etu.univ-lyon1.fr" -set sendmail = "msmtp -a david.julien@etu.univ-lyon1.fr" -alias me david.julien -set folder = "/home/swytch/.local/share/mail/david.julien@etu.univ-lyon1.fr" -set header_cache = /home/swytch/.cache -eomutt/david.julien@etu.univ-lyon1.fr/headers -set message_cachedir = /home/swytch/.cache -eomutt/david.julien@etu.univ-lyon1.fr/bodies -set mbox_type = Maildir - - -bind index,pager gg noop -bind index,pager g noop -bind index,pager M noop -bind index,pager C noop -bind index gg first-entry -unmailboxes * -unalternates * -unset signature -unmacro index o -macro index o "mw -y david.julien@etu.univ-lyon1.fr" "run mbsync to sync david.julien@etu.univ-lyon1.fr" - -mailboxes "=Sent Items" "=Drafts" "=Trash" "=INBOX" -set record = "+Sent Items" -macro index,pager gs "=Sent Items" "go to sent" -macro index,pager Ms ";=Sent Items" "move mail to sent" -macro index,pager Cs ";=Sent Items" "copy mail to sent" -set postponed = "+Drafts" -macro index,pager gd "=Drafts" "go to drafts" -macro index,pager Md ";=Drafts" "move mail to drafts" -macro index,pager Cd ";=Drafts" "copy mail to drafts" -macro index,pager gt "=Trash" "go to trash" -macro index,pager Mt ";=Trash" "move mail to trash" -macro index,pager Ct ";=Trash" "copy mail to trash" -set trash = "+Trash" -macro index,pager gi "=INBOX" "go to inbox" -macro index,pager Mi ";=INBOX" "move mail to inbox" -macro index,pager Ci ";=INBOX" "copy mail to inbox" -set spoolfile = "+INBOX" diff --git a/.config/neomutt/accounts/4-david.julien@centrale-marseille.fr.muttrc b/.config/neomutt/accounts/4-david.julien@centrale-marseille.fr.muttrc deleted file mode 100644 index 287f743..0000000 --- a/.config/neomutt/accounts/4-david.julien@centrale-marseille.fr.muttrc +++ /dev/null @@ -1,46 +0,0 @@ -# vim: filetype=neomuttrc -# muttrc file for account david.julien@centrale-marseille.fr -set realname = "Smecta" -set from = "david.julien@centrale-marseille.fr" -set sendmail = "msmtp -a david.julien@centrale-marseille.fr" -alias me david.julien -set folder = "$XDG_DATA_HOME/mail/david.julien@centrale-marseille.fr" -set header_cache = "$XDG_CACHE_HOME/neomutt/david.julien@centrale-marseille.fr/headers" -set message_cachedir = "$XDG_CACHE_HOME/neomutt/david.julien@centrale-marseille.fr/bodies" -set mbox_type = Maildir - -set crypt_autosign = no -set pgp_self_encrypt = yes -set pgp_default_key = "0x9F46CD164AE1E813" - -bind index,pager gg noop -bind index,pager g noop -bind index,pager M noop -bind index,pager C noop -bind index gg first-entry -unmailboxes * -unalternates * -set signature="$XDG_CONFIG_HOME/neomutt/accounts/centrale.signature" -unmacro index o -macro index o "mailsync" "run mbsync to sync david.julien@centrale-marseille.fr" - -mailboxes "=Sent" "=Drafts" "=INBOX" "=Trash" "=Fanfare" -set record = "+Sent" -macro index,pager gs "=Sent" "go to sent" -macro index,pager Ms ";=Sent" "move mail to sent" -macro index,pager Cs ";=Sent" "copy mail to sent" -set postponed = "+Drafts" -macro index,pager gd "=Drafts" "go to drafts" -macro index,pager Md ";=Drafts" "move mail to drafts" -macro index,pager Cd ";=Drafts" "copy mail to drafts" -macro index,pager gt "=Trash" "go to trash" -macro index,pager Mt ";=Trash" "move mail to trash" -macro index,pager Ct ";=Trash" "copy mail to trash" -set trash = "+Trash" -macro index,pager gi "=INBOX" "go to inbox" -macro index,pager Mi ";=INBOX" "move mail to inbox" -macro index,pager Ci ";=INBOX" "copy mail to inbox" -set spoolfile = "+INBOX" -macro index,pager gf "=Fanfare" "go to fanfare" -macro index,pager Mf ";=Fanfare" "move mail to fanfare" -macro index,pager Cf ";=Fanfare" "copy mail to fanfare" diff --git a/.local/bin/statusbar/sb-mailbox b/.local/bin/statusbar/sb-mailbox index fb8df42..c2d46be 100755 --- a/.local/bin/statusbar/sb-mailbox +++ b/.local/bin/statusbar/sb-mailbox @@ -16,7 +16,6 @@ do new="$(find "${XDG_DATA_HOME:-$HOME/.local/share}"/mail/$acc -path */new/* -type f | grep -iv -e "trash" -e "drafts" | wc -l 2>/dev/null)" if [ $new -gt 0 ]; then box="" - [ -n "$(echo "$acc" | sed -n '/@centrale/p')" ] && box="" [ -n "$(echo "$acc" | sed -n '/@univ/p')" ] && box="" [ -n "$(echo "$acc" | sed -n '/@mailo/p')" ] && box="" [ -n "$(echo "$acc" | sed -n '/@posteo/p')" ] && box=""