Update neomutt conf

2023-12-23 02:25:04 +01:00 · 2023-12-23 02:25:04 +01:00 · dff79df2da
commit dff79df2da
parent 6a7a35afec
14 changed files with 104 additions and 45 deletions
--- a/README.rst
+++ b/README.rst
@ -63,6 +63,7 @@ You need to install:
 - pylint
 - python3-pygments
 - rbenv
+- rclone
 - rustup
 - scdoc (debian only)
 - tig
@ -71,6 +72,7 @@ You need to install:
 - toot
 - unoconv
 - vdirsyncer
+- visidata
 - vlock
 - bluetuith (but installed by script on debian)
 - broot (but installed by script on debian)
--- a/common/.config/fish/functions/update-homes.fish
+++ b/common/.config/fish/functions/update-homes.fish
@ -342,6 +342,7 @@ function update-homes -d "Update homes configuration"
            rsync --exclude=".*.swp" -av ./desktop/ ~/
            popd
        end
+        sed -i "s:REPLACEHOME:$HOME:g" ~/.config/neomutt/neomuttrc
    end

    if functions -q update-homes-secrets
--- a/common/.config/git/config
+++ b/common/.config/git/config
@ -17,6 +17,8 @@
 	lineNumber = true
 [init]
 	defaultBranch = main
+[merge]
+	conflictStyle = diff3
 [log]
 	graphColors = "#9d79d6,#719cd6,#81b29a,#dbc074,#f4a261,#c94f6d,#dfdfe0"
 [web]
--- a/common/.config/lvim/config.lua
+++ b/common/.config/lvim/config.lua
@ -252,9 +252,11 @@ vim.opt.incsearch = true
 vim.opt.hlsearch = false
 vim.opt.ignorecase = true
 vim.opt.smartcase = true
+vim.opt.wrap = true

 vim.opt.fdm = 'indent'
-vim.opt.listchars = {eol = '¶', tab = '⁝‧' , extends = '␐', precedes= '␑', trail = '˽', nbsp = '⎵' }
+vim.opt.listchars = {eol = '¶', tab = '⁝‧' , extends = '…', precedes= '…', trail = '˽', nbsp = '⎵' }
+vim.opt.showbreak = "……"
 vim.opt.list = true

 vim.opt.spelllang = 'fr'
--- a/common/.config/mailcap
+++ b/common/.config/mailcap
@ -1,6 +1,8 @@
 text/html; TERM=tmux-direct elinks %s -dump -config-dir ~/.elinks; nametemplate=%s.html; copiousoutput
-text/gemini; offpunk %s; needsterminal
-image/*; TERM=tmux-direct timg -pk %s; needsterminal
+text/gemini; TERM=tmux-direct elinks %s -dump -config-dir ~/.elinks; nametemplate=%s.gmi; copiousoutput
+text/*; TERM=tmux-direct nvimpager -p %s; needsterminal
+image/*; TERM=tmux-direct timg -pk %s && echo "Press enter" && read TMPVAR && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo && echo ; needsterminal
 application/x-gunzip; gzcat; copiousoutput
 application/x-tar-gz; gunzip -c %s | tar -tf - ; copiousoutput
 application/postscript; ps2ascii %s; copiousoutput
+application/pdf; pdftotext %s - ; copiousoutput
--- a/common/.config/nvim/init.lua
+++ b/common/.config/nvim/init.lua
@ -154,9 +154,11 @@ vim.opt.incsearch = true
 vim.opt.hlsearch = false
 vim.opt.ignorecase = true
 vim.opt.smartcase = true
+vim.opt.wrap = true

 vim.opt.fdm = 'indent'
-vim.opt.listchars = {eol = '¶', tab = '⁝‧' , extends = '␐', precedes= '␑', trail = '˽', nbsp = '⎵' }
+vim.opt.listchars = {eol = '¶', tab = '⁝‧' , extends = '…', precedes= '…', trail = '˽', nbsp = '⎵' }
+vim.opt.showbreak = "……"
 vim.opt.list = true

 vim.opt.spelllang = 'fr'
--- a/common/.config/nvimpager/init.lua
+++ b/common/.config/nvimpager/init.lua
@ -144,9 +144,11 @@ vim.opt.incsearch = true
 vim.opt.hlsearch = false
 vim.opt.ignorecase = true
 vim.opt.smartcase = true
+vim.opt.wrap = true

 vim.opt.fdm = 'indent'
-vim.opt.listchars = {eol = '¶', tab = '⁝‧' , extends = '␐', precedes= '␑', trail = '˽', nbsp = '⎵' }
+vim.opt.listchars = {eol = '¶', tab = '⁝‧' , extends = '…', precedes= '…', trail = '˽', nbsp = '⎵' }
+vim.opt.showbreak = "……"
 vim.opt.list = true

 vim.opt.spelllang = 'fr'
--- a/desktop/.config/aerc/aerc.conf
+++ b/desktop/.config/aerc/aerc.conf
@ -380,7 +380,7 @@ threading-enabled=true
 # Specifies the command to run the editor with. It will be shown in an embedded
 # terminal, though it may also launch a graphical window if the environment
 # supports it. Defaults to $EDITOR, or vi.
-editor=nvim
+editor='nvim -c "set textwrap=0" -c "set nowrap" -c "?^$"'

 #
 # Default header fields to display when composing a message. To display
--- a/desktop/.config/afew/config
+++ b/desktop/.config/afew/config
@ -1,38 +1,45 @@
 [global]

+[HeaderMatchingFilter.0]
+header = X-Spam-Flag
+pattern = YES
+tags = +spam
+
 [FolderNameFilter]
 folder_transforms = Junk:spam Drafts:draft Sent:sent INBOX:inbox Trash:deleted
 maildir_separator = /

 [SpamFilter]
+spam_tag = spam
+
+[MeFilter]
+me_tag = me
+
 [KillThreadsFilter]
 [ListMailsFilter]
 [SentMailsFilter]
+sent_tag = sent
+
 [ArchiveSentMailsFilter]
 sent_tag = sent

 [DMARCReportInspectionFilter]
 [DKIMValidityFilter]

-[HeaderMatchingFilter.0]
-header = List-Id
-pattern = <(?P<list_id>.*)>
-tags = +lists;+{list_id}
-
 [HeaderMatchingFilter.1]
 header = To
 pattern = .*[-+](?P<autotag>\w*)@.*
-tags = -nodelimiter;+dtr:{autotag}
+tags = -nodtr;+dtr:{autotag}

 [HeaderMatchingFilter.2]
 header = Cc
 pattern = .*[-+](?P<autotag>\w*)@.*
-tags = -nodelimiter;+dtr:{autotag}
+tags = -nodtr;+dtr:{autotag}

 [HeaderMatchingFilter.3]
 header = Bcc
 pattern = .*[-+](?P<autotag>\w*)@.*
-tags = -nodelimiter;+dtr:{autotag}
+tags = -nodtr;+dtr:{autotag}

 [HeaderMatchingFilter.4]
 header = X-Mailer
@ -43,3 +50,8 @@ tags = +mailer:{mailer}
 header = X-Operating-System
 pattern = (?P<os>.*)
 tags = +os:{os}
+
+[Filter.1]
+message = Invoice
+query = 'subject:invoice OR subject:factuur OR subject:facture'
+tags = +invoice
--- a/desktop/.config/neomutt/neomuttrc
+++ b/desktop/.config/neomutt/neomuttrc
@ -1,9 +1,14 @@
+#setenv TERM xterm-direct
+
 unhdr_order *
 ignore * # ignore tous les headers, unignore plus tard

 ###### General mail config

+set sendmail = "send-from-mutt"
 my_hdr X-Operating-System: `lsb_release -a | grep "^Description:" | sed "s/Description:[\t ]*//"`
+my_hdr Markdown: false
+my_hdr reStructuredText: false

 # h key show all headers
 hdr_order Date From X-Sender Old-Return-Path Reply-To Mail-Followup-To To Cc Bcc
@ -15,6 +20,7 @@ unignore  X-Operating-System X-Mailer User-Agent X-GPG- X-PGP-

 set color_directcolor = true
 set charset = UTF-8
+set shell = "/usr/bin/fish"
 set sort = reverse-date-received
 set sort_aux = date-received
 set sort_browser = "alpha"
@ -22,13 +28,11 @@ set edit_headers = yes
 set askbcc = yes
 set askcc = yes
 set reply_to = ask-yes
-set reply_with_xorig = "yes"
+set reply_with_xorig = yes
 set copy = yes
 set include

-set forward_format = "Fwd: %s"
-
-set editor = 'nvim -c "set textwrap=72" -c "set wrap" -c "?^$"'
+set editor = 'nvim -c "set textwrap=0" -c "set nowrap" -c "?^$"'

 alternative_order text/html text/enriched text/plain
 set beep_new = yes
@ -47,13 +51,13 @@ source ~/.config/neomutt/colors.conf
 ###### General keys config

 # mutt sidebar settings
-bind index,pager \CP sidebar-prev
-bind index,pager \CN sidebar-next
-bind index,pager \CO sidebar-open
+bind index,pager \Cp sidebar-prev
+bind index,pager \Cn sidebar-next
+bind index,pager \Co sidebar-open
 bind index <tab> next-unread
 bind index,pager @ compose-to-sender
 bind index <esc>L limit-current-thread
-bind index,pager \` modify-labels
+bind index,pager \et modify-labels
 bind index,pager X change-vfolder
 bind index,pager + entire-thread
 bind index,pager \eX vfolder-from-query
@ -63,14 +67,15 @@ bind index > vfolder-window-forward

 macro index,pager B '<enter-command>toggle sidebar_visible<enter>'

-macro index,pager a "<pipe-message>khard add-email<return>" "add sender address to khard"
-macro index,pager tt "<modify-labels>!todo\n" "Toggle the 'todo' tag"
+macro index,pager a "<pipe-message>khard add-email<return>" "Ajouter l'expéditeur au carnet"
+macro index,pager \eT "<modify-labels>!todo\n" "Inverser le tag 'todo'"
+macro index,pager \eK "<modify-labels>!killed\n" "Inverser le tag 'todo'"

 set query_command= "khard email -p %s | awk -F\"  +\" '{print $1 $3}'"
 bind editor <Tab> complete-query
 bind editor ^T    complete

-# TODO macro index,pager G imap-fetch-mail
+macro index,pager G "notmuch new"
 # TODO macro index,pager c "<change-folder>?<toggle-mailboxes>" "open a different folder"

 ###### General display config
@ -81,7 +86,6 @@ set braille_friendly
 set strict_threads = yes # important, do not group all "Hey" messages
 set use_threads = threads

-set implicit_autoview
 auto_view text/plain text/html application/x-pgp-message
 set mailcap_path="~/.config/mailcap"
 set mailcap_sanitize=yes
@ -90,10 +94,10 @@ set allow_ansi=yes
 set date_format="%y.%m.%d"
 set alias_format="%4n %2f %t %-10a   %r"
 set attach_format="%u%D%I %t%4n %s %T%.40d%> [%.7m/%.10M, %.6e%?C?, %C?] "
-set compose_format="NeoMutt Compose%> [Approx. size: %l Attachments: %a]"
+set compose_format="NeoMutt Compose%> [Approx. taille: %l Fichiers: %a]"
 set folder_format="%2C %t%N %f%> %?m?%n/%m%? %s %D"
 set forward_format="[%a: %s]"
-set index_format="%4C %H %Z %d %-15.15L %4c %s"
+set index_format="%4C %H %Z %d %4c %-15.15L %g %s"
 set pager_format="%Z %C/%m: %-20.20n %s%* %P"
 set pgp_entry_format="%4n %t%f %4l/0x%k %-4a %2c %u"
 set query_format="%4c %t %-25.25a %-25.25n %?e?(%e)?"
@ -116,13 +120,27 @@ set write_inc=5
 unignore organization organisation x-mailer: x-newsreader: x-mailing-list: x-original-to:
 unignore posted-to:

-tag-transforms "inbox"    "i"   \
-                "unread"  "u"   \
-                "replied" "↻ "  \
-                "sent"    "➥ "  \
-                "todo"    "T"   \
-                "deleted" "DEL" \
-                "invites" "CAL"
+tag-transforms "inbox"      "i" \
+               "unread"     "u" \
+               "new"        "󰧫n" \
+               "lists"      "L" \
+               "replied"    "r" \
+               "forwarded"  "f" \
+               "sent"       "s" \
+               "flagged"    "F" \
+               "todo"       "t" \
+               "deleted"    "D" \
+               "encrypted"  "e" \
+               "invites"    "󰃰c" \
+               "attachment" "󰁦a" \
+               "signed"     "󱧃Sig" \
+               "dkim-ok"    "󱝗DK" \
+               "spam"       "S" \
+               "invoice"    "I" \
+               "acbraine"   "󰝚M" \
+               "killed"     "K" REPLACE_WITH_TAG_TRANSFORMS
+
+set hidden_tags = ""

 ###### General GPG config

@ -187,25 +205,33 @@ set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --l
 # This version uses --status-fd messages
 set pgp_good_sign="^\\[GNUPG:\\] GOODSIG"

-###### General identity config
-
-# Personnel
 set use_envelope_from = yes
 set reverse_name = yes
 set reverse_realname = yes

-###### General accounts config
+spam "X-DCC-.*-Metrics:.*(....)=many"         "90+/DCC-%1"
+spam "X-Spam-Status: Yes"                     "90+/SA"
+spam "X-PerlMX-Spam: .*Probability=([0-9]+)%" "%1/PM"
+set spam_separator=", "

 set virtual_spoolfile = yes
 set folder = "~/.local/share/mail/"
-set nm_config_file = "~/.config/notmuch/notmuch-config"
-set nm_default_url = "notmuch:///home/kujiu/.local/share/mail"
+#set nm_config_file = "~/.config/notmuch/notmuch-config"
+set nm_default_url = "notmuch://REPLACEHOME/.local/share/mail"
 set nm_query_window_or_terms="tag:unread and tag:flagged"
+set nm_query_type = "threads"
+set nm_exclude_tags = "killed,deleted,spam"
+set nm_record_tags = "-inbox,sent,me"
+set nm_unread_tag = unread
+set nm_query_window_enable=yes
+set nm_query_window_duration=2
+set nm_query_window_timebase="month"
 set spoolfile=+Inbox
 set postponed=+Drafts
 set record=+Sent
 set trash=+Trash

-virtual-mailboxes "My INBOX" "notmuch://?query=tag:inbox"
-folder-hook "My INBOX" "/usr/bin/fish ~/.config/neomutt/accounts.fish"
+virtual-mailboxes "Boîte combinée" "notmuch://?query=tag:inbox"
+virtual-mailboxes "Aujourd'hui" "notmuch://?query=date:today"
+#folder-hook "Boîte combinée" "/usr/bin/fish ~/.config/neomutt/accounts.fish"
 set mbox_type=Maildir
--- a/desktop/.local/share/mail/.notmuch/hooks/pre-new
+++ b/desktop/.local/share/mail/.notmuch/hooks/pre-new
@ -1,3 +1,4 @@
 #!/usr/bin/env fish

+notmuch search --output=files --format=text0 tag:killed | xargs -r0 rm
 mbsync -a
--- a/templates/.config/khard/khard.conf
+++ b/templates/.config/khard/khard.conf
@ -49,7 +49,7 @@ preferred_email_address_type = pref, work, home
 # default: ,  (the empty list)
 private_objects = XMPP, Mastodon, Matrix, Peertube, Diaspora, PixelFed, Gemini, Youtube, Skype
 # preferred vcard version: 3.0 / 4.0
-preferred_version = 4.0
+preferred_version = 3.0
 # Look into source vcf files to speed up search queries: yes / no
 search_in_source_files = no
 # skip unparsable vcard files: yes / no
--- a/templates/.config/notmuch/notmuch-config
+++ b/templates/.config/notmuch/notmuch-config
@ -45,7 +45,7 @@ other_email=test2@example.com;test3@example.com
 #		in the mail store.
 #
 [new]
-tags=new
+tags=nodtr
 # Search configuration
 #
 # The following option is supported here:
--- a/update-homes-secrets-example.fish
+++ b/update-homes-secrets-example.fish
@ -70,5 +70,12 @@ function update-homes-secrets -d "Update secrets for configuration of homes"
        sed -i "s/REPLACEUSER/example (@$(hostname))/g" ~/.config/git/config
        sed -i "s/REPLACEMAIL/test@example.com/g" ~/.config/git/config
        sed -i "s/REPLACEKEY/HEX/g" ~/.config/git/config
+
+
+        echo
+        echo
+        echo (set_color 719cd6)"*** Set neomutt ***"(set_color normal)
+        echo
+        sed -i "s/REPLACE_WITH_TAG_TRANSFORMS//g" ~/.config/neomutt/neomuttrc
    end
 end