Merge branch 'dev' into mercury

system: add "mode" to xrandr setup
        chage default lock utility to xss-lock

mail: fix notifications through cronie
This commit is contained in:
David JULIEN 2022-11-23 23:38:43 +01:00
commit 059ca336c1
4 changed files with 28 additions and 5 deletions

View File

@ -17,6 +17,7 @@ dwmblocks &
xrdb "$XDG_CONFIG_HOME/X11/xresources"
xrdb -merge "$XDG_STATE_HOME/xcolors"
xss-lock -- slock &
get_dbus &
setxkbmap 'fr(oss)'
remaps &

View File

@ -52,8 +52,9 @@ default() {
}
setup() {
[ -z "$mode" ] && mode="auto"
xrandr --output "$primary" --auto --scale 1.0x1.0 \
--output "$secondary" --"$direction"-of "$primary" --auto
--output "$secondary" --"$direction"-of "$primary" --$mode
}
morescreen() { # If multi-monitor is selected and there are more than two screens.

18
.local/bin/get_dbus Executable file
View File

@ -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

View File

@ -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.