aboutsummaryrefslogtreecommitdiff
path: root/.xinitrc
diff options
context:
space:
mode:
Diffstat (limited to '.xinitrc')
-rwxr-xr-x.xinitrc11
1 files changed, 2 insertions, 9 deletions
diff --git a/.xinitrc b/.xinitrc
index af926dd..05049bd 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -6,17 +6,11 @@ sysresources=/etc/X11/xinit/.Xresources
sysmodmap=/etc/X11/xinit/.Xmodmap
# merge in defaults and keymaps
-
[ -f $sysresources ] && xrdb -merge $sysresources
-
[ -f $sysmodmap ] && xmodmap $sysmodmap
-
[ -f "$userresources" ] && xrdb -merge "$userresources"
-
[ -f "$usermodmap" ] && xmodmap "$usermodmap"
-# start some nice programs
-
if [ -d /etc/X11/xinit/xinitrc.d ] ; then
for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
[ -x "$f" ] && . "$f"
@@ -24,6 +18,7 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
unset f
fi
+# start some nice programs
lxsession&
nitrogen --restore &
picom &
@@ -31,9 +26,6 @@ dunst &
cbatticon &
[[ -f ~/.Xmodmap ]] && xmodmap .Xmodmap
-# launch this from wm or it'll crash
-# polybar mybar &
-
case $1 in
xmonad) exec xmonad ;;
# openbox) exec openbox-session & tint2 ;;
@@ -41,6 +33,7 @@ case $1 in
bspwm) exec bspwm ;;
herbstluftwm) exec herbstluftwm ;;
spectrwm) exec spectrwm ;;
+ awesome) exec awesome ;;
dwm) exec dwm ;;
*) exec xmonad ;;
esac