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

diff --git a/x/.xinitrc b/x/.xinitrc
index d0b6c3a..b136e77 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -11,36 +11,61 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
   unset f
 fi
 
-# Enable this for non-reparenting window managers
+# workaround for some java apps, when running a non-reparenting window manager
 export _JAVA_AWT_WM_NONREPARENTING=1
 
 xrdb -merge ~/.Xresources
-#xsetroot -cursor_name left_ptr &  # set the cursor icon
-feh --bg-scale ~/pics/fall.jpg
+xrdb -merge ~/.base16-tomorrow.dark.256.xresources
+
+# set the cursor icon
+xsetroot -cursor_name left_ptr &
+
+# set the wallpaper
+sh ~/.fehbg &
+
+# font stuff
 xset +fp /usr/share/fonts/local
 xset +fp ~/.fonts
 xset fp rehash
 xset b off
-#xrdb -merge ~/.theme/base16-thewildhunt.dark.xresources
-#compton &
-xbacklight -set 50
+
+# the compositor
+compton &
+
+# xbacklight -set 50
+
+# synaptics (touchpad) configs
 synclient TapButton2=3
 synclient TapButton3=2
 synclient HorizTwoFingerScroll=1
 synclient VertScrollDelta=-237
 synclient HorizScrollDelta=-237
 
+# swap caps lock and esc
+setxkbmap -option caps:swapescape
+
 # MPD daemon start (if no other instance exists)
 [ -z $(pidof mpd) ] && mpd &
 
 # screen powersave
 xset +dpms
 xset dpms 0 0 300
-xautolock -time 5 -locker i3lock-wrapper &
+
+# lock the screen using lightdm after 5 minutes
+xautolock -time 5 -locker "dm-tool lock" &
+
 
 # exec gnome-session
 # exec startkde
-#exec startxfce4
+# 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