x: use the correct init files

.xinitrc is not the right file to use. .xsession and .xsessionrc should
be used instead.

I always wondered what all those different bits did!

Also: xserverrc will reuse the current tty for running X instead of
running on tty7. This fixes console kit authenticaton through magic.
tmux: Calculate battery draw properly