Switch to neovim and make changes for it