diff --git a/modules/home-config.nix b/modules/home-config.nix
index 99e6856..eb49532 100644
--- a/modules/home-config.nix
+++ b/modules/home-config.nix
@@ -112,7 +112,9 @@ in {
         source = treesitterWithGrammars;
       };
     };
-
+    home.sessionVariables = {
+        EDITOR = "nvim";
+    };
     accounts.email.accounts = {
       "mrflos@chmok.net" = {
         realName = "Florian Schmitt";
@@ -220,6 +222,7 @@ in {
         extraConfig = {
           pull.rebase = true;
           init.defaultBranch = "main";
+          core.editor = "nvim";
           core.fileMode = false;
         };
       };