From 73cd9ce5c908965080b7fd0e7197e8739e8df3f8 Mon Sep 17 00:00:00 2001
From: Amin Bandali <me@aminb.org>
Date: Sat, 28 Feb 2015 16:13:42 -0500
Subject: [PATCH 1/1] rename xinitrc to xprofile since I'm now using lightdm
 instead of slim

---
 x/{.xinitrc => .xprofile} | 47 ++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 16 deletions(-)
 rename x/{.xinitrc => .xprofile} (58%)

diff --git a/x/.xinitrc b/x/.xprofile
similarity index 58%
rename from x/.xinitrc
rename to x/.xprofile
index 57f848a..e4734db 100755
--- a/x/.xinitrc
+++ b/x/.xprofile
@@ -11,24 +11,36 @@ 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
+
+# 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
+
+# the compositor
 compton &
-xbacklight -set 50
+
+# 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)
@@ -37,19 +49,22 @@ setxkbmap -option caps:swapescape
 # 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
-sxhkd &
-panel &
-
-DEFAULTSESSION=bspwm
-case "$1" in
-    i3) exec i3;;
-     bspwm) exec bspwm;;
-     *) exec $DEFAULTSESSION ;;
-esac
+# source ~/.profile
+# sxhkd &
+# panel &
+
+# DEFAULTSESSION=bspwm
+# case "$1" in
+#     i3) exec i3;;
+#      bspwm) exec bspwm;;
+#      *) exec $DEFAULTSESSION ;;
+# esac
-- 
2.20.1