X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/8c680d42e898f1b747a182503beb479dbfcb26a6..d0c8be2e7e1998bbd7655a6422d7624909aeea68:/x/.xinitrc?ds=sidebyside

diff --git a/x/.xinitrc b/x/.xinitrc
index 169a707..57f848a 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -15,20 +15,21 @@ fi
 export _JAVA_AWT_WM_NONREPARENTING=1
 
 xrdb -merge ~/.Xresources
-#xsetroot -cursor_name left_ptr &  # set the cursor icon
-feh --bg-scale ~/pics/fall.jpg
+xsetroot -cursor_name left_ptr &  # set the cursor icon
+sh ~/.fehbg &
 xset +fp /usr/share/fonts/local
 xset +fp ~/.fonts
 xset fp rehash
 xset b off
 #xrdb -merge ~/.theme/base16-thewildhunt.dark.xresources
-#compton &
+compton &
 xbacklight -set 50
 synclient TapButton2=3
 synclient TapButton3=2
 synclient HorizTwoFingerScroll=1
 synclient VertScrollDelta=-237
 synclient HorizScrollDelta=-237
+setxkbmap -option caps:swapescape
 
 # MPD daemon start (if no other instance exists)
 [ -z $(pidof mpd) ] && mpd &
@@ -36,10 +37,19 @@ synclient HorizScrollDelta=-237
 # 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
 source ~/.profile
-exec i3
+sxhkd &
+panel &
+
+DEFAULTSESSION=bspwm
+case "$1" in
+    i3) exec i3;;
+     bspwm) exec bspwm;;
+     *) exec $DEFAULTSESSION ;;
+esac