diff --git a/modules/emacs.nix b/modules/emacs.nix
index d54e3c3b..f1262c06 100644
--- a/modules/emacs.nix
+++ b/modules/emacs.nix
@@ -26,6 +26,10 @@
             (if (daemonp)
                 (add-hook 'server-after-make-frame-hook #'emoji-fonts)
                     (emoji-fonts))
+
+            ;; Disable default evil keybindings, since evil-collection is a superset
+            ;; See https://github.com/emacs-evil/evil-collection/issues/60
+            (setq evil-want-keybinding nil)
           '';
           recommendedGcSettings = true;
           usePackageVerbose = true;
@@ -38,7 +42,13 @@
             };
             evil = {
               enable = true;
-              config = "(evil-mode 1)";
+              config = ''
+                (evil-mode 1)
+              '';
+            };
+            evil-collection = {
+              enable = true;
+              after = [ "evil" ];
             };
             fira-code-mode = {
               enable = true;
@@ -49,6 +59,13 @@
               diminish = [ "flycheck-mode" ];
               config = "(global-flycheck-mode)";
             };
+            general = {
+              enable = true;
+              after = [ "evil" "which-key" ];
+              config = ''
+                (general-evil-setup)
+              '';
+            };
             ledger-mode = {
               enable = true;
               mode = [ ''"\\.journal\\'"'' ];
@@ -65,6 +82,9 @@
               enable = true;
               command = [ "lsp" ];
             };
+            magit = {
+              enable = true;
+            };
             markdown-mode = {
               enable = true;
               command = [ "markdown-mode" "gfm-mode" ];