X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/faafd14a401e9b4abc401235578fd9fa99019e7c..99e472224bb3d8c9bff3621c0401de06ffe88056:/x/.xinitrc

diff --git a/x/.xinitrc b/x/.xinitrc
index e6f0f41..57f848a 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -16,7 +16,7 @@ export _JAVA_AWT_WM_NONREPARENTING=1
 
 xrdb -merge ~/.Xresources
 xsetroot -cursor_name left_ptr &  # set the cursor icon
-feh --bg-scale ~/pics/fall.jpg
+sh ~/.fehbg &
 xset +fp /usr/share/fonts/local
 xset +fp ~/.fonts
 xset fp rehash
@@ -29,7 +29,7 @@ synclient TapButton3=2
 synclient HorizTwoFingerScroll=1
 synclient VertScrollDelta=-237
 synclient HorizScrollDelta=-237
-sxhkd &
+setxkbmap -option caps:swapescape
 
 # MPD daemon start (if no other instance exists)
 [ -z $(pidof mpd) ] && mpd &
@@ -37,13 +37,19 @@ sxhkd &
 # screen powersave
 xset +dpms
 xset dpms 0 0 300
+xautolock -time 5 -locker i3lock-wrapper &
 
 # exec gnome-session
 # exec startkde
 #exec startxfce4
 # ...or the Window Manager of your choice
-
-sxhkd &
 source ~/.profile
+sxhkd &
 panel &
-exec bspwm
+
+DEFAULTSESSION=bspwm
+case "$1" in
+    i3) exec i3;;
+     bspwm) exec bspwm;;
+     *) exec $DEFAULTSESSION ;;
+esac