From 87de4c3ad0f8cdd788924931c05a7c0d01c559e9 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Tue, 18 Oct 2022 10:55:16 +0200 Subject: [PATCH 1/5] [mail] fix: use the right @univ-nantes adress ref. 5bc787c --- .config/mbsync/config | 14 ++++++------- .config/msmtp/config | 4 ++-- ...c => 2-david.julien@univ-nantes.fr.muttrc} | 20 +++++++++---------- .config/mutt/muttrc | 4 ++-- .local/bin/statusbar/sb-mailbox | 3 ++- 5 files changed, 23 insertions(+), 22 deletions(-) rename .config/mutt/accounts/{2-david.julien@etu.univ-nantes.fr.muttrc => 2-david.julien@univ-nantes.fr.muttrc} (77%) diff --git a/.config/mbsync/config b/.config/mbsync/config index 244335b..0b14d53 100644 --- a/.config/mbsync/config +++ b/.config/mbsync/config @@ -25,7 +25,7 @@ ExpireUnread no # End Profile # University -IMAPStore david.julien@etu.univ-nantes.fr-remote +IMAPStore david.julien@univ-nantes.fr-remote Host imaps.etu.univ-nantes.fr Port 993 User E22D718J @@ -34,15 +34,15 @@ AuthMechs LOGIN SSLType IMAPS CertificateFile /etc/ssl/certs/ca-certificates.crt -MaildirStore david.julien@etu.univ-nantes.fr-local +MaildirStore david.julien@univ-nantes.fr-local Subfolders Verbatim -Path /home/swytch/.local/share/mail/david.julien@etu.univ-nantes.fr/ -Inbox /home/swytch/.local/share/mail/david.julien@etu.univ-nantes.fr/INBOX +Path /home/swytch/.local/share/mail/david.julien@univ-nantes.fr/ +Inbox /home/swytch/.local/share/mail/david.julien@univ-nantes.fr/INBOX -Channel david.julien@etu.univ-nantes.fr +Channel david.julien@univ-nantes.fr Expunge Both -Far :david.julien@etu.univ-nantes.fr-remote: -Near :david.julien@etu.univ-nantes.fr-local: +Far :david.julien@univ-nantes.fr-remote: +Near :david.julien@univ-nantes.fr-local: Patterns * !"[Gmail]/All Mail" Create Both SyncState * diff --git a/.config/msmtp/config b/.config/msmtp/config index 1cfb35f..438caed 100644 --- a/.config/msmtp/config +++ b/.config/msmtp/config @@ -9,10 +9,10 @@ tls on tls_trust_file /etc/ssl/certs/ca-certificates.crt logfile /home/swytch/.config/msmtp/msmtp.log -account david.julien@etu.univ-nantes.fr +account david.julien@univ-nantes.fr host smtp.etu.univ-nantes.fr port 587 -from david.julien@etu.univ-nantes.fr +from david.julien@univ-nantes.fr user E22D718J passwordeval "pass univ-nantes.fr/E22D718J" auth on diff --git a/.config/mutt/accounts/2-david.julien@etu.univ-nantes.fr.muttrc b/.config/mutt/accounts/2-david.julien@univ-nantes.fr.muttrc similarity index 77% rename from .config/mutt/accounts/2-david.julien@etu.univ-nantes.fr.muttrc rename to .config/mutt/accounts/2-david.julien@univ-nantes.fr.muttrc index f2c0521..dbc919d 100644 --- a/.config/mutt/accounts/2-david.julien@etu.univ-nantes.fr.muttrc +++ b/.config/mutt/accounts/2-david.julien@univ-nantes.fr.muttrc @@ -1,16 +1,16 @@ # vim: filetype=neomuttrc -# muttrc file for account david.julien@etu.univ-nantes.fr +# muttrc file for account david.julien@univ-nantes.fr set realname = "David JULIEN" -set from = "david.julien@etu.univ-nantes.fr" -set sendmail = "msmtp -a david.julien@etu.univ-nantes.fr" -alias me david.julien -set folder = "$XDG_DATA_HOME/mail/david.julien@etu.univ-nantes.fr" -set header_cache = "$XDG_CACHE_HOME/mutt/david.julien@etu.univ-nantes.fr/headers" -set message_cachedir = "$XDG_CACHE_HOME/mutt/david.julien@etu.univ-nantes.fr/bodies" +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 mbox_type = Maildir set crypt_autosign = yes -set pgp_sign_as = "0x70F6BD57D3BD8027" +set pgp_sign_as = "0x1DD6B2BA6DD78810" bind index,pager gg noop bind index,pager g noop @@ -21,9 +21,9 @@ unmailboxes * unalternates * set signature="$XDG_CONFIG_HOME/mutt/accounts/nantes.signature" unmacro index o -macro index o "mailsync" "run mbsync to sync david.julien@etu.univ-nantes.fr" +macro index o "mailsync" "run mbsync to sync david.julien@univ-nantes.fr" -mailboxes "=Sent" "=Drafts" "=Trash" "=INBOX" "=thesis" +mailboxes "=Sent" "=Drafts" "=Trash" "=INBOX" "=thesis" "=admin" "=login" set record = "+Sent" macro index,pager gs "=Sent" "go to sent" macro index,pager Ms ";=Sent" "move mail to sent" diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc index 7c849b7..072ca89 100644 --- a/.config/mutt/muttrc +++ b/.config/mutt/muttrc @@ -2,6 +2,6 @@ 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@etu.univ-nantes.fr.muttrc!;' "switch to david.julien@etu.univ-nantes.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@etu.univ-nantes.fr.muttrc +source $XDG_CONFIG_HOME/mutt/accounts/2-david.julien@univ-nantes.fr.muttrc diff --git a/.local/bin/statusbar/sb-mailbox b/.local/bin/statusbar/sb-mailbox index 3bc59ac..32fe024 100755 --- a/.local/bin/statusbar/sb-mailbox +++ b/.local/bin/statusbar/sb-mailbox @@ -15,8 +15,9 @@ for acc in $(ls "${XDG_DATA_HOME:-$HOME/.local/share}"/mail/) do new="$(find "${XDG_DATA_HOME:-$HOME/.local/share}"/mail/$acc/*/new/ -type f | grep -iv "trash" | wc -l 2>/dev/null)" if [ $new -gt 0 ]; then + box="" [ -n "$(echo "$acc" | sed -n '/@centrale/p')" ] && box="" - [ -n "$(echo "$acc" | sed -n '/@etu/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="" unread="$unread/$box$new" From 6226e99122b4b26264e51a3557a7ffc4ad6a5638 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Wed, 19 Oct 2022 10:05:50 +0200 Subject: [PATCH 2/5] [mail] feat: subfolders display for @univ-nantes --- .config/mutt/accounts/2-david.julien@univ-nantes.fr.muttrc | 2 +- .config/mutt/neomutt.muttrc | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.config/mutt/accounts/2-david.julien@univ-nantes.fr.muttrc b/.config/mutt/accounts/2-david.julien@univ-nantes.fr.muttrc index dbc919d..2e15aad 100644 --- a/.config/mutt/accounts/2-david.julien@univ-nantes.fr.muttrc +++ b/.config/mutt/accounts/2-david.julien@univ-nantes.fr.muttrc @@ -23,7 +23,7 @@ set signature="$XDG_CONFIG_HOME/mutt/accounts/nantes.signature" unmacro index o macro index o "mailsync" "run mbsync to sync david.julien@univ-nantes.fr" -mailboxes "=Sent" "=Drafts" "=Trash" "=INBOX" "=thesis" "=admin" "=login" +mailboxes "=Sent" "=Drafts" "=Trash" "=INBOX" "=thesis" "=admin" "=login" "=teaching" "=teaching/X11I020" "=teaching/X11I040" set record = "+Sent" macro index,pager gs "=Sent" "go to sent" macro index,pager Ms ";=Sent" "move mail to sent" diff --git a/.config/mutt/neomutt.muttrc b/.config/mutt/neomutt.muttrc index 5b70109..a000907 100644 --- a/.config/mutt/neomutt.muttrc +++ b/.config/mutt/neomutt.muttrc @@ -81,7 +81,9 @@ macro index A "all\n" "show all messages (undo limit)" # Sidebar mappings set sidebar_visible = yes set sidebar_width = 20 -set sidebar_short_path = yes +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?' From d5714c0ca28d944d0fce52ddaab20b5ec78037e6 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Wed, 19 Oct 2022 23:22:00 +0200 Subject: [PATCH 3/5] [git] fix: gitignore path in ~/.local --- .gitignore | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3ef6e1e..648d53d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,22 +4,28 @@ !/.xprofile !/.zshenv +!/.local !/.local/bin/ -!/local/src/ -!/.local/state/ +!/.local/src/ +/.local/lib/ +/.local/include/ +/.local/share/ +/.local/state/ !/.config/ /.config/dconf/ /.config/font-manager/ /.config/fontconfig/ -/.config/gnupg/ +/.config/gnupg/* !/.config/gnupg/gpg-agent.conf /.config/libreoffice/ -/.config/mpd/ +/.config/mpd/* !/.config/mpd/mpd.conf /.config/mutt/.mailsynclastrun /.config/nvim/plugin/ /.config/pulse/ +/.config/transmission-daemon/* +/.config/transmission-daemon/settings.json /.config/zsh/.zcompdump /**/*.log From 5cce96f8ada846c4cdd9f7b839e507896500ca30 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Wed, 19 Oct 2022 23:27:18 +0200 Subject: [PATCH 4/5] [mail] fix: globbing for subdirectories --- .local/bin/mailsync | 4 ++-- .local/bin/statusbar/sb-mailbox | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.local/bin/mailsync b/.local/bin/mailsync index c8fd4f9..aa37703 100755 --- a/.local/bin/mailsync +++ b/.local/bin/mailsync @@ -40,7 +40,7 @@ messageinfo() { syncandnotify() { acc="$(echo "$account" | sed "s/.*\///")" mbsync "$acc" - new="$(find "${XDG_DATA_HOME:-$HOME/.local/share}"/mail/$acc/*/new/ -type f -newer "${XDG_CONFIG_HOME:-$HOME/.config}/mutt/.mailsynclastrun" | grep -iv "trash" 2>/dev/null)" + new="$(find "${XDG_DATA_HOME:-$HOME/.local/share}"/mail/$acc -path */new/* -type f -newer "${XDG_STATE_HOME:-$HOME/.local/state}/mailsynclastrun" | grep -iv "trash" 2>/dev/null)" newcount=$(echo "$new" | sed '/^\s*$/d' | wc -l) if [ "$newcount" -gt "0" ]; then for file in $new; do @@ -66,4 +66,4 @@ wait notmuch new 2>/dev/null #Create a touch file that indicates the time of the last run of mailsync -touch "${XDG_CONFIG_HOME:-$HOME/.config}/mutt/.mailsynclastrun" +touch "${XDG_STATE_HOME:-$HOME/.local/state}/mailsynclastrun" diff --git a/.local/bin/statusbar/sb-mailbox b/.local/bin/statusbar/sb-mailbox index 32fe024..2aaee38 100755 --- a/.local/bin/statusbar/sb-mailbox +++ b/.local/bin/statusbar/sb-mailbox @@ -13,7 +13,7 @@ unread="" for acc in $(ls "${XDG_DATA_HOME:-$HOME/.local/share}"/mail/) do - new="$(find "${XDG_DATA_HOME:-$HOME/.local/share}"/mail/$acc/*/new/ -type f | grep -iv "trash" | wc -l 2>/dev/null)" + new="$(find "${XDG_DATA_HOME:-$HOME/.local/share}"/mail/$acc -path */new/* -type f | grep -iv "trash" | wc -l 2>/dev/null)" if [ $new -gt 0 ]; then box="" [ -n "$(echo "$acc" | sed -n '/@centrale/p')" ] && box="" @@ -23,6 +23,6 @@ do unread="$unread/$box$new" fi done -[ -n "$unread" ] && unread="($(echo "$unread" | cut -c 2-))" || exit +[ -n "$unread" ] && unread="$(echo "$unread" | cut -c 2-)" || exit printf "  %s%s " "$unread" "$icon" From 13efea3df40651d96ce8aa0d77519ad4e4096113 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Wed, 19 Oct 2022 23:27:36 +0200 Subject: [PATCH 5/5] [nvim.cmp] fix: deprecated function --- .config/nvim/lua/plugin/lsp/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/nvim/lua/plugin/lsp/init.lua b/.config/nvim/lua/plugin/lsp/init.lua index 88be39c..4a22120 100644 --- a/.config/nvim/lua/plugin/lsp/init.lua +++ b/.config/nvim/lua/plugin/lsp/init.lua @@ -55,7 +55,7 @@ end -- nvim-cmp supports additional completion capabilities local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities = require("cmp_nvim_lsp").update_capabilities(capabilities) +capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities) local servers = { "clangd", "sumneko_lua", "texlab" } lsp_installer.setup {