From 3a8e28ad46681702668e43d246c15d2b063523a3 Mon Sep 17 00:00:00 2001
From: David JULIEN <swytch@mailo.com>
Date: Wed, 23 Nov 2022 23:32:30 +0100
Subject: [PATCH 1/3] [mail] fix: notifications through cronie

---
 .config/X11/xprofile |  1 +
 .local/bin/get_dbus  | 18 ++++++++++++++++++
 .local/bin/mailsync  | 11 +++++++----
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100755 .local/bin/get_dbus

diff --git a/.config/X11/xprofile b/.config/X11/xprofile
index a6d14fd..749350e 100644
--- a/.config/X11/xprofile
+++ b/.config/X11/xprofile
@@ -18,6 +18,7 @@ dwmblocks &
 xrdb "$XDG_CONFIG_HOME/X11/xresources"
 xrdb -merge "$XDG_STATE_HOME/xcolors"
 xautolock -locker slock -time 5 -corners 000- &
+get_dbus &
 
 xinput set-prop 'Synaptics TM3072-003' 'libinput Tapping Enabled' 1 &
 xinput set-prop 'Synaptics TM3072-003' 'libinput Natural Scrolling Enabled' 1 &
diff --git a/.local/bin/get_dbus b/.local/bin/get_dbus
new file mode 100755
index 0000000..4ec00aa
--- /dev/null
+++ b/.local/bin/get_dbus
@@ -0,0 +1,18 @@
+#!/usr/bin/env sh
+
+######################################################################
+# @author      : swytch
+# @file        : get_dbus
+# @license     : GPLv3
+# @created     : Wednesday May 20, 2020 18:04:01 CEST
+#
+# @description : retrieve and store DBUS_SESSION_BUS_ADDRESS in case
+#                some utilitary needs it (e.g. cronie)
+######################################################################
+
+
+env | grep DBUS_SESSION_BUS_ADDRESS > "$HOME/.dbus/Xdbus"
+echo "export DBUS_SESSION_BUS_ADDRESS" >> "$HOME/.dbus/Xdbus"
+chmod 600 $HOME/.dbus/Xdbus
+
+exit 0
diff --git a/.local/bin/mailsync b/.local/bin/mailsync
index 7cb2231..57d7f0e 100755
--- a/.local/bin/mailsync
+++ b/.local/bin/mailsync
@@ -23,16 +23,19 @@ eval "$(grep -h -- \
 	"^\s*\(export \)\?\(MBSYNCRC\|PASSWORD_STORE_DIR\|NOTMUCH_CONFIG\|GNUPGHOME\)=" \
 	"$XDG_CONFIG_HOME/zsh/.zprofile" "$HOME/.pam_environment" 2>/dev/null)"
 
-case "$(readlink -f /sbin/init)" in
-	*systemd*) export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus ;;
-esac
 export GPG_TTY=$TTY
+[ -r "$HOME/.dbus/Xdbus" ] && source "$HOME/.dbus/Xdbus"
 
 # Config file location must be passed at execution, not as envrionment variable
 [ -n "$MBSYNCRC" ] && alias mbsync="mbsync -c $MBSYNCRC" || MBSYNCRC="$HOME/.mbsyncrc"
 
+pgrepoutput="$(pgrep -ax X\(\|org\|wayland\))"
+displays="$(echo "$pgrepoutput" | grep -wo "[0-9]*:[0-9]\+" | sort -u)"
 notify() {
-	notify-send "neomutt" " $2 new mail(s) in \`$1\` account."
+        [ -n "$pgrepoutput" ] && for x in ${displays:-0:}; do
+                export DISPLAY=$x
+                notify-send "neomutt" " $2 new mail(s) in \`$1\` account."
+        done;
 }
 
 # Check account for new mail. Notify if there is new content.

From 5a4c0abad05ed0a0effa251a641501ae259b9b48 Mon Sep 17 00:00:00 2001
From: David JULIEN <swytch@mailo.com>
Date: Wed, 23 Nov 2022 23:33:17 +0100
Subject: [PATCH 2/3] [system] feat: change default lockscreen to xss-lock

---
 .config/X11/xprofile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/X11/xprofile b/.config/X11/xprofile
index 749350e..edf332c 100644
--- a/.config/X11/xprofile
+++ b/.config/X11/xprofile
@@ -17,7 +17,7 @@ setbg &
 dwmblocks &
 xrdb "$XDG_CONFIG_HOME/X11/xresources"
 xrdb -merge "$XDG_STATE_HOME/xcolors"
-xautolock -locker slock -time 5 -corners 000- &
+xss-lock -- slock &
 get_dbus &
 
 xinput set-prop 'Synaptics TM3072-003' 'libinput Tapping Enabled' 1 &

From d62bd902a063ef371ed63dcd017a6b8748d256f5 Mon Sep 17 00:00:00 2001
From: David JULIEN <swytch@mailo.com>
Date: Thu, 24 Nov 2022 09:20:05 +0100
Subject: [PATCH 3/3] [mail] feat: keymaps to next- or previous-new mail

---
 .config/neomutt/maps | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.config/neomutt/maps b/.config/neomutt/maps
index 3df953c..7088d5d 100644
--- a/.config/neomutt/maps
+++ b/.config/neomutt/maps
@@ -13,6 +13,8 @@ macro index,pager im '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/neomu
 # General rebindings
 bind index j next-entry
 bind index k previous-entry
+bind index J next-new
+bind index K previous-new
 bind attach <return> view-mailcap
 bind attach l view-mailcap
 bind editor <space> noop