diff options
author | June McEnroe <programble@gmail.com> | 2011-09-24 12:17:30 -0400 |
---|---|---|
committer | June McEnroe <programble@gmail.com> | 2011-09-24 12:17:30 -0400 |
commit | cf6923bea0362ce02d913c0c517b142f5750ae38 (patch) | |
tree | ddc4a4d3fd7e918ad0b82470cb4b091e76cb2ea7 | |
parent | Fixed user mounting permissions and stuff (diff) | |
download | src-cf6923bea0362ce02d913c0c517b142f5750ae38.tar.gz src-cf6923bea0362ce02d913c0c517b142f5750ae38.zip |
Refactored xinitrc
-rw-r--r-- | _xinitrc | 12 |
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 |