aboutsummaryrefslogtreecommitdiff
path: root/.config/X11/xinitrc
diff options
context:
space:
mode:
Diffstat (limited to '.config/X11/xinitrc')
-rwxr-xr-x[-rw-r--r--].config/X11/xinitrc26
1 files changed, 13 insertions, 13 deletions
diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc
index 302b56e..116c9da 100644..100755
--- a/.config/X11/xinitrc
+++ b/.config/X11/xinitrc
@@ -1,27 +1,27 @@
-#!/bin/sh
+#!/bin/sh -eu
-userresources=$HOME/.config/X11/Xresources
-usermodmap=$HOME/.config/X11/Xmodmap
+Xmodmap=$HOME/.config/X11/Xmodmap
+Xresources=$HOME/.config/X11/Xresources
+Xauthority=$HOME/.config/X11/Xauthority
# merge in defaults and keymaps
-[ -f "$userresources" ] && xrdb -merge "$userresources";
-[ -f "$usermodmap" ] && xmodmap "$usermodmap";
+[ -f "$Xmodmap" ] && xmodmap "$Xmodmap"
+[ -f "$Xresources" ] && xrdb -merge "$Xresources"
# screen timeouts
xset s 0 0 &
xset dpms 3600 3600 3600 &
# set cursor
-xsetroot -cursor_name left_ptr;
+xsetroot -cursor_name left_ptr
# set keypress repeat
-xset r rate 200 60;
-
-# generate xauth
-xauth generate :0 . trusted;
+xset r rate 200 60
# import systemctl environment
-systemctl --user import-environment;
+systemctl --user import-environment
-# Run awesome
-exec awesome --no-argb;
+# launch environment
+dbus-launch xfce4-session \
+ || dbus-broker-launch xfce4-session \
+ || exec awesome --no-argb