From 3af214ef23abbff1bbfb1d7f6e4acfdf4ca4b72b Mon Sep 17 00:00:00 2001
From: Amin Bandali <me@aminb.org>
Date: Fri, 13 Feb 2015 21:20:40 -0500
Subject: back to bspwm, bye i3

---
 x/.profile |  6 +++++-
 x/.xinitrc | 14 +++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'x')

diff --git a/x/.profile b/x/.profile
index b65f405..73c7528 100644
--- a/x/.profile
+++ b/x/.profile
@@ -1 +1,5 @@
-export PATH="$HOME/.local/bin:$PATH"
+export PATH="$HOME/.local/bin:$HOME/.cabal/bin:$PATH"
+PANEL_FIFO=/tmp/panel-fifo
+PANEL_HEIGHT=24
+PANEL_FONT_FAMILY="-*-termsyn-medium-r-normal-*-12-*-*-*-c-*-*-1"
+export PANEL_FIFO PANEL_HEIGHT PANEL_FONT_FAMILY
diff --git a/x/.xinitrc b/x/.xinitrc
index b33ae68..b735fe3 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -15,14 +15,14 @@ fi
 export _JAVA_AWT_WM_NONREPARENTING=1
 
 xrdb -merge ~/.Xresources
-#xsetroot -cursor_name left_ptr &  # set the cursor icon
+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
@@ -43,4 +43,12 @@ xautolock -time 5 -locker i3lock-wrapper &
 #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
-- 
cgit v1.2.3-60-g2f50