diff --git a/home-manager/modules/git/default.nix b/home-manager/modules/git/default.nix
index 516792c..081e782 100644
--- a/home-manager/modules/git/default.nix
+++ b/home-manager/modules/git/default.nix
@@ -101,7 +101,7 @@ in
           defaultBranch = "main";
         };
         core = {
-          # editor = "${pkgs.neovim}/bin/nvim";
+          editor = "${config.eboskma.programs.emacs.package}/bin/emacsclient";
           pager = "${pkgs.bat}/bin/bat";
         };
         merge = {