From 7a0030b064b8bd0202d96971b1af5440e03cd79d Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Sun, 12 Dec 2021 23:35:54 +0100 Subject: [PATCH 1/9] [nvim] fix: lsp count in statusline vim.lsp.diagnostic.get_count() got deprecated --- .config/nvim/lua/statusline.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.config/nvim/lua/statusline.lua b/.config/nvim/lua/statusline.lua index 647b19c..65e2f4d 100644 --- a/.config/nvim/lua/statusline.lua +++ b/.config/nvim/lua/statusline.lua @@ -109,7 +109,12 @@ local function get_lsp_diagnostics(bufnr) } for k, level in pairs(levels) do - result[k] = vim.lsp.diagnostic.get_count(bufnr, level) + local count = 0 + local diags = vim.diagnostic.get(bufnr, { severity = level }) + for _, _ in pairs(diags) do + count = count + 1 + end + result[k] = count end return result From fcbd7dbfc40b9fbc0762789419315cca53adeb0d Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Mon, 13 Dec 2021 20:09:24 +0100 Subject: [PATCH 2/9] [mutt] add mutt config --- .config/mutt/muttrc | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .config/mutt/muttrc diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc new file mode 100644 index 0000000..25f9bd4 --- /dev/null +++ b/.config/mutt/muttrc @@ -0,0 +1,7 @@ +# vim: filetype=neomuttrc +source /home/swytch/.config/mutt/neomutt.muttrc +source /home/swytch/.config/mutt/accounts/1-david.julien@posteo.net.muttrc +macro index,pager i1 'source /home/swytch/.config/mutt/accounts/1-david.julien@posteo.net.muttrc!;' "switch to david.julien@posteo.net" +source /home/swytch/.config/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc +macro index,pager i2 'source /home/swytch/.config/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc!;' "switch to david.julien@ens-lyon.fr" +macro index,pager i3 'source /home/swytch/.config/mutt/accounts/3-david.julien@mailo.com.muttrc!;' "switch to david.julien@mailto.com" From 4055da38397090fed8d732049ccba4efffa57ae4 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Mon, 13 Dec 2021 20:10:02 +0100 Subject: [PATCH 3/9] [mutt] add mailo account config --- .../accounts/3-david.julien@mailo.com.muttrc | 49 +++++++++++++++++++ .config/mutt/accounts/mailo.signature | 2 + 2 files changed, 51 insertions(+) create mode 100644 .config/mutt/accounts/3-david.julien@mailo.com.muttrc create mode 100644 .config/mutt/accounts/mailo.signature diff --git a/.config/mutt/accounts/3-david.julien@mailo.com.muttrc b/.config/mutt/accounts/3-david.julien@mailo.com.muttrc new file mode 100644 index 0000000..a7d2f75 --- /dev/null +++ b/.config/mutt/accounts/3-david.julien@mailo.com.muttrc @@ -0,0 +1,49 @@ +# vim: filetype=neomuttrc +# muttrc file for account email@adress.you +set realname = "David JULIEN" +set from = "david.julien@mailo.com" +set sendmail = "msmtp -a david.julien@mailo.com" +alias me david.julien +set folder = "/home/swytch/.local/share/mail/david.julien@mailo.com" +set header_cache = /home/swytch/.cache/mutt/david.julien@mailo.com/headers +set message_cachedir = /home/swytch/.cache/mutt/david.julien@mailo.com/bodies +set mbox_type = Maildir + +set crypt_autosign = yes +set pgp_sign_as = "0x86C2FBBE4A4F0F7F" + +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="/home/swytch/.config/mutt/accounts/mailo.signature" +unmacro index o +macro index o "mailsync" "run mbsync to sync david.julien@mailo.com" + +mailboxes "=sent" "=draftbox" "=trash" "=INBOX" "=farigoule" "=promo_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 = "+draftbox" +macro index,pager gd "=draftbox" "go to drafts" +macro index,pager Md ";=draftbox" "move mail to drafts" +macro index,pager Cd ";=draftbox" "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 "=farigoule" "go to farigoule" +macro index,pager Mf ";=farigoule" "move mail to farigoule" +macro index,pager Cf ";=farigoule" "copy mail to farigoule" +macro index,pager gp "=promo_fanfare" "go to promo_fanfare" +macro index,pager Mp ";=promo_fanfare" "move mail to promo_fanfare" +macro index,pager Cp ";=promo_fanfare" "copy mail to promo_fanfare" diff --git a/.config/mutt/accounts/mailo.signature b/.config/mutt/accounts/mailo.signature new file mode 100644 index 0000000..034281e --- /dev/null +++ b/.config/mutt/accounts/mailo.signature @@ -0,0 +1,2 @@ + +David JULIEN From 81f003243b7534766766beb9bca309efc31081c0 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Mon, 13 Dec 2021 20:10:56 +0100 Subject: [PATCH 4/9] [mail] add mbsync + msmtp config --- .config/mbsync/config | 78 +++++++++++++++++++++++++++++++++++++++++++ .config/msmtp/config | 32 ++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 .config/mbsync/config create mode 100644 .config/msmtp/config diff --git a/.config/mbsync/config b/.config/mbsync/config new file mode 100644 index 0000000..403b4b6 --- /dev/null +++ b/.config/mbsync/config @@ -0,0 +1,78 @@ +# Personnal - Critical +IMAPStore david.julien@posteo.net-remote +Host posteo.de +Port 993 +User david.julien@posteo.net +PassCmd "pass david.julien@posteo.net" +AuthMechs LOGIN +SSLType IMAPS +CertificateFile /etc/ssl/certs/ca-certificates.crt + +MaildirStore david.julien@posteo.net-local +Subfolders Verbatim +Path /home/swytch/.local/share/mail/david.julien@posteo.net/ +Inbox /home/swytch/.local/share/mail/david.julien@posteo.net/INBOX + +Channel david.julien@posteo.net +Expunge Both +Far :david.julien@posteo.net-remote: +Near :david.julien@posteo.net-local: +Patterns * !"[Gmail]/All Mail" +Create Both +SyncState * +MaxMessages 0 +ExpireUnread no +# End Profile + + +# University +IMAPStore david.julien@ens-lyon.fr-remote +Host imaps.ens-lyon.fr +Port 993 +User djulien +PassCmd "pass ens-lyon.fr/djulien" +AuthMechs LOGIN +SSLType IMAPS +CertificateFile /etc/ssl/certs/ca-certificates.crt + +MaildirStore david.julien@ens-lyon.fr-local +Subfolders Verbatim +Path /home/swytch/.local/share/mail/david.julien@ens-lyon.fr/ +Inbox /home/swytch/.local/share/mail/david.julien@ens-lyon.fr/INBOX + +Channel david.julien@ens-lyon.fr +Expunge Both +Far :david.julien@ens-lyon.fr-remote: +Near :david.julien@ens-lyon.fr-local: +Patterns * !"[Gmail]/All Mail" +Create Both +SyncState * +MaxMessages 0 +ExpireUnread no +# End Profile + +# Personnal +IMAPStore david.julien@mailo.com-remote +Host mail.mailo.com +Port 993 +User david.julien@mailo.com +PassCmd "pass david.julien@mailo.com" +AuthMechs LOGIN +SSLType IMAPS +CertificateFile /etc/ssl/certs/ca-certificates.crt + +MaildirStore david.julien@mailo.com-local +Subfolders Verbatim +Path /home/swytch/.local/share/mail/david.julien@mailo.com/ +Inbox /home/swytch/.local/share/mail/david.julien@mailo.com/INBOX + +Channel david.julien@mailo.com +Expunge Both +Far :david.julien@mailo.com-remote: +Near :david.julien@mailo.com-local: +Patterns * !"[Gmail]/All Mail" +Create Both +SyncState * +MaxMessages 0 +ExpireUnread no +# End Profile diff --git a/.config/msmtp/config b/.config/msmtp/config new file mode 100644 index 0000000..c105f09 --- /dev/null +++ b/.config/msmtp/config @@ -0,0 +1,32 @@ +account david.julien@posteo.net +host posteo.de +port 587 +from david.julien@posteo.net +user david.julien@posteo.net +passwordeval "pass david.julien@posteo.net" +auth on +tls on +tls_trust_file /etc/ssl/certs/ca-certificates.crt +logfile /home/swytch/.config/msmtp/msmtp.log + +account david.julien@ens-lyon.fr +host smtp.ens-lyon.fr +port 587 +from david.julien@ens-lyon.fr +user djulien +passwordeval "pass ens-lyon.fr/djulien" +auth on +tls on +tls_trust_file /etc/ssl/certs/ca-certificates.crt +logfile /home/swytch/.config/msmtp/msmtp.log + +account david.julien@mailo.com +host mail.mailo.com +port 587 +from david.julien@mailo.com +user david.julien@mailo.com +passwordeval "pass david.julien@mailo.com" +auth on +tls on +tls_trust_file /etc/ssl/certs/ca-certificates.crt +logfile /home/swytch/.config/msmtp/msmtp.log From 116987ba42ae76886d0f2b539ce998100e8b5112 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Mon, 13 Dec 2021 20:29:27 +0100 Subject: [PATCH 5/9] [statusbar] add mailo slot to sb-mailbox --- .local/bin/statusbar/sb-mailbox | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.local/bin/statusbar/sb-mailbox b/.local/bin/statusbar/sb-mailbox index 1f7fd24..11dade1 100755 --- a/.local/bin/statusbar/sb-mailbox +++ b/.local/bin/statusbar/sb-mailbox @@ -16,7 +16,8 @@ do new="$(find "${XDG_DATA_HOME:-$HOME/.local/share}"/mail/$acc/[Ii][Nn][Bb][Oo][Xx]/new/* -type f | wc -l 2>/dev/null)" if [ $new -gt 0 ]; then [ -n "$(echo "$acc" | sed -n '/@etu/p')" ] && box="" - [ -n "$(echo "$acc" | sed -n '/@posteo/p')" ] && box="" + [ -n "$(echo "$acc" | sed -n '/@mailo/p')" ] && box="" + [ -n "$(echo "$acc" | sed -n '/@posteo/p')" ] && box="" unread="$unread/$box$new" fi done From a1386ad08c475b735c30243ca418316df509dd0b Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Mon, 13 Dec 2021 20:51:07 +0100 Subject: [PATCH 6/9] [mutt] cleanup: no need to source posteo file --- .config/mutt/muttrc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc index 25f9bd4..a9c2241 100644 --- a/.config/mutt/muttrc +++ b/.config/mutt/muttrc @@ -1,7 +1,6 @@ # vim: filetype=neomuttrc source /home/swytch/.config/mutt/neomutt.muttrc -source /home/swytch/.config/mutt/accounts/1-david.julien@posteo.net.muttrc macro index,pager i1 'source /home/swytch/.config/mutt/accounts/1-david.julien@posteo.net.muttrc!;' "switch to david.julien@posteo.net" -source /home/swytch/.config/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc macro index,pager i2 'source /home/swytch/.config/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc!;' "switch to david.julien@ens-lyon.fr" macro index,pager i3 'source /home/swytch/.config/mutt/accounts/3-david.julien@mailo.com.muttrc!;' "switch to david.julien@mailto.com" +source /home/swytch/.config/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc From fea6a564d7d2e4c82acf392ab5ed31c0c3fe123f Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Tue, 14 Dec 2021 08:17:03 +0100 Subject: [PATCH 7/9] [mail] enhance scan for new mail take everything into account, but trash --- .local/bin/mailsync | 2 +- .local/bin/statusbar/sb-mailbox | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.local/bin/mailsync b/.local/bin/mailsync index 475cc79..c8fd4f9 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/[Ii][Nn][Bb][Oo][Xx]/new/* -type f -newer "${XDG_CONFIG_HOME:-$HOME/.config}/mutt/.mailsynclastrun" 2>/dev/null)" + 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)" newcount=$(echo "$new" | sed '/^\s*$/d' | wc -l) if [ "$newcount" -gt "0" ]; then for file in $new; do diff --git a/.local/bin/statusbar/sb-mailbox b/.local/bin/statusbar/sb-mailbox index 11dade1..4004638 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/[Ii][Nn][Bb][Oo][Xx]/new/* -type f | wc -l 2>/dev/null)" + 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 [ -n "$(echo "$acc" | sed -n '/@etu/p')" ] && box="" [ -n "$(echo "$acc" | sed -n '/@mailo/p')" ] && box="" From 35ecf56e2c9c2e89f3217ec71543ea9b9d8f7f15 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Tue, 14 Dec 2021 17:14:31 +0100 Subject: [PATCH 8/9] [mutt] feat: change keymaps to switch mailboxes --- .config/mutt/muttrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc index a9c2241..e4303c3 100644 --- a/.config/mutt/muttrc +++ b/.config/mutt/muttrc @@ -1,6 +1,6 @@ # vim: filetype=neomuttrc source /home/swytch/.config/mutt/neomutt.muttrc -macro index,pager i1 'source /home/swytch/.config/mutt/accounts/1-david.julien@posteo.net.muttrc!;' "switch to david.julien@posteo.net" -macro index,pager i2 'source /home/swytch/.config/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc!;' "switch to david.julien@ens-lyon.fr" -macro index,pager i3 'source /home/swytch/.config/mutt/accounts/3-david.julien@mailo.com.muttrc!;' "switch to david.julien@mailto.com" +macro index,pager ip 'source /home/swytch/.config/mutt/accounts/1-david.julien@posteo.net.muttrc!;' "switch to david.julien@posteo.net" +macro index,pager is 'source /home/swytch/.config/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc!;' "switch to david.julien@ens-lyon.fr" +macro index,pager im 'source /home/swytch/.config/mutt/accounts/3-david.julien@mailo.com.muttrc!;' "switch to david.julien@mailto.com" source /home/swytch/.config/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc From f86fa9b2cf13fddb3d7f51421cd707fe174e9f71 Mon Sep 17 00:00:00 2001 From: David JULIEN Date: Tue, 14 Dec 2021 17:15:04 +0100 Subject: [PATCH 9/9] [git] change default signing key --- .config/git/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/git/config b/.config/git/config index 01c0d86..0dc9787 100644 --- a/.config/git/config +++ b/.config/git/config @@ -1,7 +1,7 @@ [user] - email = swy7ch@protonmail.com + email = swytch@mailo.com name = David JULIEN - signingKey = D9D47382 + signingKey = AA82A06F [gpg] program = gpg2 [init]