update xinitrc

This commit is contained in:
Thomas Ruoff
2016-02-11 14:43:46 +01:00
parent 4ddb2cc024
commit 5fa12d62f6

25
xinitrc
View File

@@ -1,11 +1,9 @@
#!/bin/sh #!/bin/bash
# #
# ~/.xinitrc # ~/.xinitrc
# #
# Executed by startx (run your window manager from here) # Executed by startx (run your window manager from here)
case $((hostname)) in
t430s-arch)
if [ -d /etc/X11/xinit/xinitrc.d ]; then if [ -d /etc/X11/xinit/xinitrc.d ]; then
for f in /etc/X11/xinit/xinitrc.d/*; do for f in /etc/X11/xinit/xinitrc.d/*; do
[ -x "$f" ] && . "$f" [ -x "$f" ] && . "$f"
@@ -14,8 +12,7 @@ case $((hostname)) in
fi fi
pulseaudio --start pulseaudio --start
eval $(gpg-agent -s --enable-ssh-support --daemon --write-env-file $HOME/.gpg-agent-info)
eval $(gpg-agent --enable-ssh-support --daemon)
xrdb $HOME/.Xresources xrdb $HOME/.Xresources
@@ -23,23 +20,17 @@ case $((hostname)) in
xset +fp /usr/share/fonts/local xset +fp /usr/share/fonts/local
xset fp rehash xset fp rehash
echo $1 > ~/.xinitrc-arg
case $1 in case $1 in
enlightenment)
exec enlightenment_start
;;
xterm) xterm)
exec xterm exec xterm
;; ;;
bspwm)
sxhkd &
exec bspwm
;;
hlwm|*) # default is herbstluftwm hlwm|*) # default is herbstluftwm
/usr/bin/xscreensaver -no-splash & xbindkeys -n &
xbindkeys & urxvtd &
udiskie --tray &
xautolock -time 10 -locker slock -corners -0+0 -cornerdelay 3 &
exec herbstluftwm --locked exec herbstluftwm --locked
;; ;;
esac esac
;;
esac