Use ~ consistently instead of some ..
Add support for neovim