update xinitrc

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

59
xinitrc
View File

@@ -1,45 +1,36 @@
#!/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 if [ -d /etc/X11/xinit/xinitrc.d ]; then
t430s-arch) for f in /etc/X11/xinit/xinitrc.d/*; do
if [ -d /etc/X11/xinit/xinitrc.d ]; then [ -x "$f" ] && . "$f"
for f in /etc/X11/xinit/xinitrc.d/*; do done
[ -x "$f" ] && . "$f" unset f
done fi
unset f
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 # add additional fonts
xset +fp /usr/share/fonts/local
xset fp rehash
# add additional fonts echo $1 > ~/.xinitrc-arg
xset +fp /usr/share/fonts/local
xset fp rehash
case $1 in case $1 in
enlightenment) xterm)
exec enlightenment_start exec xterm
;; ;;
xterm) hlwm|*) # default is herbstluftwm
exec xterm xbindkeys -n &
;; urxvtd &
bspwm) udiskie --tray &
sxhkd & xautolock -time 10 -locker slock -corners -0+0 -cornerdelay 3 &
exec bspwm exec herbstluftwm --locked
;; ;;
hlwm|*) # default is herbstluftwm
/usr/bin/xscreensaver -no-splash &
xbindkeys &
exec herbstluftwm --locked
;;
esac
;;
esac esac