refactor more vim options from old config