From 0ce756263db79b857d1d9700a7ce886ac5ccf587 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Sat, 24 Sep 2011 12:17:30 -0400
Subject: Refactored xinitrc

---
 _xinitrc | 12 +++---------
 1 file 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
-- 
cgit 1.4.1