From a1386ad08c475b735c30243ca418316df509dd0b Mon Sep 17 00:00:00 2001
From: David JULIEN <swy7ch@protonmail.com>
Date: Mon, 13 Dec 2021 20:51:07 +0100
Subject: [PATCH 1/2] [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 '<sync-mailbox><enter-command>source /home/swytch/.config/mutt/accounts/1-david.julien@posteo.net.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to david.julien@posteo.net"
-source /home/swytch/.config/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc
 macro index,pager i2 '<sync-mailbox><enter-command>source /home/swytch/.config/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to david.julien@ens-lyon.fr"
 macro index,pager i3 '<sync-mailbox><enter-command>source /home/swytch/.config/mutt/accounts/3-david.julien@mailo.com.muttrc<enter><change-folder>!<enter>;<check-stats>' "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 <swy7ch@protonmail.com>
Date: Tue, 14 Dec 2021 08:17:03 +0100
Subject: [PATCH 2/2] [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=""