neovim: Remove patch merged upstream