projects
/
~bandali
/
configs
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
back to bspwm, bye i3
[~bandali/configs]
/
x
/
.xinitrc
diff --git
a/x/.xinitrc
b/x/.xinitrc
index
e6f0f41
..
b735fe3
100755
(executable)
--- a/
x/.xinitrc
+++ b/
x/.xinitrc
@@
-16,7
+16,7
@@
export _JAVA_AWT_WM_NONREPARENTING=1
xrdb -merge ~/.Xresources
xsetroot -cursor_name left_ptr & # set the cursor icon
xrdb -merge ~/.Xresources
xsetroot -cursor_name left_ptr & # set the cursor icon
-feh --bg-scale ~/pics/fall.jpg
+sh ~/.fehbg &
xset +fp /usr/share/fonts/local
xset +fp ~/.fonts
xset fp rehash
xset +fp /usr/share/fonts/local
xset +fp ~/.fonts
xset fp rehash
@@
-29,7
+29,6
@@
synclient TapButton3=2
synclient HorizTwoFingerScroll=1
synclient VertScrollDelta=-237
synclient HorizScrollDelta=-237
synclient HorizTwoFingerScroll=1
synclient VertScrollDelta=-237
synclient HorizScrollDelta=-237
-sxhkd &
# MPD daemon start (if no other instance exists)
[ -z $(pidof mpd) ] && mpd &
# MPD daemon start (if no other instance exists)
[ -z $(pidof mpd) ] && mpd &
@@
-37,13
+36,19
@@
sxhkd &
# screen powersave
xset +dpms
xset dpms 0 0 300
# screen powersave
xset +dpms
xset dpms 0 0 300
+xautolock -time 5 -locker i3lock-wrapper &
# exec gnome-session
# exec startkde
#exec startxfce4
# ...or the Window Manager of your choice
# exec gnome-session
# exec startkde
#exec startxfce4
# ...or the Window Manager of your choice
-
-sxhkd &
source ~/.profile
source ~/.profile
+sxhkd &
panel &
panel &
-exec bspwm
+
+DEFAULTSESSION=bspwm
+case "$1" in
+ i3) exec i3;;
+ bspwm) exec bspwm;;
+ *) exec $DEFAULTSESSION ;;
+esac