Clean up session initialization to support lightdm and reduce dupe btwn bash and zsh