Rework vim setup