diff --git a/flake.nix b/flake.nix
index 167db4a..15d58a4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,7 +11,7 @@
   }: let
     username = "joy";
     domain = "joygnu.org";
-    mail = "contact@joygnu.org";
+    mail = "mail@joygnu.org";
     nixpath = "nix/";
 
     nixosconf = {modules}:
diff --git a/modules/programs/home.nix b/modules/programs/home.nix
index 755bb5a..47de2b5 100644
--- a/modules/programs/home.nix
+++ b/modules/programs/home.nix
@@ -6,7 +6,7 @@
     ./mail
     ./yazi
     ./zsh
-    ./git
+    # ./git
     ./helix
     ./newsboat
     ./zoxide
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 44db5b7..d6bbdba 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -4,6 +4,7 @@
     ./homemanger
     ./networking
     ./doas
+    ./git
     ./misc
   ];
 }
diff --git a/modules/system/doas/default.nix b/modules/system/doas/default.nix
index 8fdc451..ca09073 100644
--- a/modules/system/doas/default.nix
+++ b/modules/system/doas/default.nix
@@ -8,6 +8,4 @@
       persist = true;
     }
   ];
-  programs.git.enable = true;
-  programs.git.config = {safe.directory = "*";};
 }
diff --git a/modules/system/git/default.nix b/modules/system/git/default.nix
new file mode 100644
index 0000000..ef88903
--- /dev/null
+++ b/modules/system/git/default.nix
@@ -0,0 +1,11 @@
+{mail, ...}: {
+  programs.git = {
+    enable = true;
+    config = {
+      safe.directory = "*";
+      user.name = "joy";
+      user.email = "${mail}";
+      init.defaultBranch = "main";
+    };
+  };
+}