Reorganize zsh config, update Brewfile