diff --git a/nixos/home-manager/programs/emacs/emacs.nix b/nixos/home-manager/programs/emacs/emacs.nix
index 8d04eb90..40cd8ca8 100644
--- a/nixos/home-manager/programs/emacs/emacs.nix
+++ b/nixos/home-manager/programs/emacs/emacs.nix
@@ -3,8 +3,12 @@ let
   myEmacs = pkgs.emacs-nox;
   inherit ((pkgs.emacsPackagesFor myEmacs)) emacsWithPackages;
 in emacsWithPackages (epkgs:
-  (with epkgs.melpaStablePackages; [ magit solarized-theme evil ])
-  ++ (with epkgs.melpaPackages; [ xterm-color nix-mode ])
+  (with epkgs.melpaStablePackages; [
+    magit
+    solarized-theme
+    evil
+    evil-collection
+  ]) ++ (with epkgs.melpaPackages; [ xterm-color nix-mode ])
   ++ (with epkgs.elpaPackages; [
     beacon # ; highlight my cursor when scrolling
     nameless # ; hide current package name everywhere in elisp code
diff --git a/nixos/home-manager/programs/emacs/home.nix b/nixos/home-manager/programs/emacs/home.nix
index 48c4bee0..bfcc8783 100644
--- a/nixos/home-manager/programs/emacs/home.nix
+++ b/nixos/home-manager/programs/emacs/home.nix
@@ -15,9 +15,12 @@
     (set-terminal-parameter nil 'background-mode 'dark)
     (xterm-mouse-mode 1)
 
+    (setq evil-want-integration t)
+    (setq evil-want-keybinding nil)
     (require 'evil)
+    (when (require 'evil-collection nil t)
+      (evil-collection-init))
     (evil-mode 1)
-
     (setq custom-tab-width 2)
     (setq indent-tabs-mode nil)