summary refs log tree commit diff
path: root/_xinitrc
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2011-09-24 12:17:30 -0400
committerJune McEnroe <june@causal.agency>2011-09-24 12:17:30 -0400
commit0ce756263db79b857d1d9700a7ce886ac5ccf587 (patch)
tree6fbd87d2520b62038235b164f0a95a7632245731 /_xinitrc
parentFixed user mounting permissions and stuff (diff)
downloadsrc-0ce756263db79b857d1d9700a7ce886ac5ccf587.tar.gz
src-0ce756263db79b857d1d9700a7ce886ac5ccf587.zip
Refactored xinitrc
Diffstat (limited to '_xinitrc')
-rw-r--r--_xinitrc12
1 files changed, 3 insertions, 9 deletions
diff --git a/_xinitrc b/_xinitrc
index dc3d1c06..61d281d3 100644
--- a/_xinitrc
+++ b/_xinitrc
@@ -1,5 +1,3 @@
-#eval `dbus-launch --sh-syntax --exit-with-session`
-
 xrdb ~/.Xresources &
 xautolock -locker slimlock -time 30 &
 
@@ -7,10 +5,6 @@ xautolock -locker slimlock -time 30 &
 xmodmap -e "clear Lock" -e "keysym Caps_Lock = Escape" # Caps Lock -> Esc
 xmodmap -e "remove mod1 = Alt_R" -e "keysym Alt_R = Multi_key" # Right Alt -> Compose
 
-DEFAULT=openbox-session
-
-if [[ $1 ]]; then
-    exec ck-launch-session dbus-launch $1
-else
-    exec ck-launch-session dbus-launch $DEFAULT
-fi
+SESSION=openbox-session
+[ $1 ] && SESSION=$1
+exec ck-launch-session dbus-launch $SESSION