summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sxhkd/.config/sxhkd/sxhkdrc2
-rw-r--r--x/.profile6
-rwxr-xr-xx/.xinitrc14
3 files changed, 17 insertions, 5 deletions
diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc
index 9a5a1fb..a1a9795 100644
--- a/sxhkd/.config/sxhkd/sxhkdrc
+++ b/sxhkd/.config/sxhkd/sxhkdrc
@@ -84,7 +84,7 @@ super + Return
urxvt
super + space
- dmenu_run -fn "-*-termsyn-medium-r-normal-*-13-*-*-*-c-*-*-1" -h 20 -nb \#2f2b30 -nf \#fefdfb -sb \#cf0f38 -sf \#fefdfb
+ dmenu_run -fn "-*-termsyn-medium-r-normal-*-13-*-*-*-c-*-*-1" -h 24 -nb \#2f2b30 -nf \#fefdfb -sb \#cf0f38 -sf \#fefdfb
super + x
slimlock
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