-if [ "$(hostname)" = "jirud" ]; then
- [ -f "/usr/lib/x86_64-linux-gnu/xfce4/notifyd/xfce4-notifyd" ] && /usr/lib/x86_64-linux-gnu/xfce4/notifyd/xfce4-notifyd &
- [ -x "$(command -v light-locker)" ] && light-locker --lock-on-suspend &
- [ -x "$(command -v pasystray)" ] && pasystray -a &
- [ -x "$(command -v nm-applet)" ] && nm-applet &
- [ -x "$(command -v compton)" ] && compton &
- [ -x "$(command -v emacs)" ] && exec emacs -ib 0
-else
- startxfce4
+if [ -f "$HOME/.xinitrc" ]; then
+ . "$HOME/.xinitrc"
fi
+
+[ -f "/usr/lib/x86_64-linux-gnu/xfce4/notifyd/xfce4-notifyd" ] && /usr/lib/x86_64-linux-gnu/xfce4/notifyd/xfce4-notifyd &
+[ -x "$(command -v light-locker)" ] && light-locker --lock-on-suspend &
+[ -x "$(command -v pasystray)" ] && pasystray -a &
+[ -x "$(command -v nm-applet)" ] && nm-applet &
+[ -x "$(command -v compton)" ] && compton &
+[ -x "$(command -v dunst)" ] && dunst &
+[ -x "$(command -v emacs)" ] && exec ssh-agent exwm -ib 0