diff --git a/hosts/chmura/configuration.nix b/hosts/chmura/configuration.nix
index f0da53ca..cdedd479 100644
--- a/hosts/chmura/configuration.nix
+++ b/hosts/chmura/configuration.nix
@@ -99,7 +99,6 @@
                 userName = "jacekpoz";
                 userEmail = "jacekpoz@cock.li";
                 signingKey = "0EEE6B0C9A8CC06820E59C3894E812A8B12AAE3C";
-                editor = "${pkgs.neovim-nightly}/bin/nvim";
                 defaultBranch = "master";
             };
             starship.enable = true;
diff --git a/hosts/niks/configuration.nix b/hosts/niks/configuration.nix
index 43bf9cd3..d1a60b66 100644
--- a/hosts/niks/configuration.nix
+++ b/hosts/niks/configuration.nix
@@ -342,7 +342,6 @@
                 userName = "jacekpoz";
                 userEmail = "jacekpoz@cock.li";
                 signingKey = "0EEE6B0C9A8CC06820E59C3894E812A8B12AAE3C";
-                editor = config.environment.sessionVariables.EDITOR;
                 defaultBranch = "master";
             };
             starship.enable = true;
diff --git a/modules/cli/git.nix b/modules/cli/git.nix
index 7ac89693..08773d48 100644
--- a/modules/cli/git.nix
+++ b/modules/cli/git.nix
@@ -22,7 +22,7 @@ in {
         };
         editor = mkOption {
             type = types.str;
-            default = "nvim";
+            default = config.environment.sessionVariables.EDITOR;
             description = "commit message editor";
         };
         defaultBranch = mkOption {