From de2c0972ee949ed37680cfde1696b900386213bf Mon Sep 17 00:00:00 2001
From: Amin Bandali <me@aminb.org>
Date: Thu, 5 Mar 2015 21:27:50 -0500
Subject: rename xprofile to xinitrc again back to slim from lightdm

---
 x/.xinitrc  | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 x/.xprofile | 71 -------------------------------------------------------------
 2 files changed, 71 insertions(+), 71 deletions(-)
 create mode 100755 x/.xinitrc
 delete mode 100755 x/.xprofile

diff --git a/x/.xinitrc b/x/.xinitrc
new file mode 100755
index 0000000..b136e77
--- /dev/null
+++ b/x/.xinitrc
@@ -0,0 +1,71 @@
+#!/bin/sh
+#
+# ~/.xinitrc
+#
+# Executed by startx (run your window manager from here)
+
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+  for f in /etc/X11/xinit/xinitrc.d/*; do
+    [ -x "$f" ] && . "$f"
+  done
+  unset f
+fi
+
+# workaround for some java apps, when running a non-reparenting window manager
+export _JAVA_AWT_WM_NONREPARENTING=1
+
+xrdb -merge ~/.Xresources
+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
+
+# 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
+
+# lock the screen using lightdm after 5 minutes
+xautolock -time 5 -locker "dm-tool lock" &
+
+
+# exec gnome-session
+# exec startkde
+# 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
diff --git a/x/.xprofile b/x/.xprofile
deleted file mode 100755
index 8342420..0000000
--- a/x/.xprofile
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
-
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
-  for f in /etc/X11/xinit/xinitrc.d/*; do
-    [ -x "$f" ] && . "$f"
-  done
-  unset f
-fi
-
-# workaround for some java apps, when running a non-reparenting window manager
-export _JAVA_AWT_WM_NONREPARENTING=1
-
-xrdb -merge ~/.Xresources
-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
-
-# 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
-
-# lock the screen using lightdm after 5 minutes
-xautolock -time 5 -locker "dm-tool lock" &
-
-
-# exec gnome-session
-# exec startkde
-# 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
-- 
cgit v1.2.3-60-g2f50