Just use the emacs-native implementation (evil-mode).