diff --git a/home/common.nix b/home/common.nix
index c32623e1..bbf4236a 100644
--- a/home/common.nix
+++ b/home/common.nix
@@ -168,7 +168,7 @@ in rec {
       init.defaultBranch = "main";
       pull.ff = "only";
       pull.rebase = true;
-      core.editor = "${pkgs.emacs}/bin/emacsclient --create-frame --alternate-editor=''";
+      core.editor = "${kak.package}/bin/kak";
     };
   };
 }