xinitrc: refactor and xbanish support