|
@@ -25,9 +25,6 @@ eval "$(grep -h -- \ |
|
|
"$HOME/.profile" "$HOME/.bash_profile" "$HOME/.zprofile" "$HOME/.config/zsh/.zprofile" "$HOME/.zshenv" \ |
|
|
"$HOME/.profile" "$HOME/.bash_profile" "$HOME/.zprofile" "$HOME/.config/zsh/.zprofile" "$HOME/.zshenv" \ |
|
|
"$HOME/.bashrc" "$HOME/.zshrc" "$HOME/.config/zsh/.zshrc" "$HOME/.pam_environment" 2>/dev/null)" |
|
|
"$HOME/.bashrc" "$HOME/.zshrc" "$HOME/.config/zsh/.zshrc" "$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 |
|
|
export GPG_TTY=$TTY |
|
|
|
|
|
|
|
|
[ -n "$MBSYNCRC" ] && alias mbsync="mbsync -c $MBSYNCRC" || MBSYNCRC="$HOME/.mbsyncrc" |
|
|
[ -n "$MBSYNCRC" ] && alias mbsync="mbsync -c $MBSYNCRC" || MBSYNCRC="$HOME/.mbsyncrc" |
|
@@ -39,6 +36,9 @@ case "$(uname)" in |
|
|
messageinfo() { osascript -e "display notification with title \"📧 $from\" subtitle \"$subject\"" ;} |
|
|
messageinfo() { osascript -e "display notification with title \"📧 $from\" subtitle \"$subject\"" ;} |
|
|
;; |
|
|
;; |
|
|
*) |
|
|
*) |
|
|
|
|
|
case "$(readlink -f /sbin/init)" in |
|
|
|
|
|
*systemd*) export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus ;; |
|
|
|
|
|
esac |
|
|
# remember if a display server is running since `ps` doesn't always contain a display |
|
|
# remember if a display server is running since `ps` doesn't always contain a display |
|
|
pgrepoutput="$(pgrep -a X\(org\|wayland\))" |
|
|
pgrepoutput="$(pgrep -a X\(org\|wayland\))" |
|
|
displays="$(echo "$pgrepoutput" | grep -wo "[0-9]*:[0-9]\+" | sort -u)" |
|
|
displays="$(echo "$pgrepoutput" | grep -wo "[0-9]*:[0-9]\+" | sort -u)" |
|
|