vim rework

Signed-off-by: Adrian-Tudor Panescu <adrian@panescu.com>