diff --git a/home-manager/default.nix b/home-manager/default.nix
index 4424548..ebfd303 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, username, fullname, email, ... }:
+{ config, pkgs, username, ... }:
 {
   home.username = username;
   home.homeDirectory = "/home/" + username;
@@ -6,31 +6,4 @@
   home.stateVersion = "21.11";
 
   imports = [ ./shell ./wayland ./xdg.nix ./tools.nix ./email.nix ];
-
-  programs.git = {
-    enable = true;
-    userName = fullname;
-    userEmail = email;
-
-    signing.key = "6CB106C25E86A9F7";
-    signing.signByDefault = true;
-
-    extraConfig = {
-      credential.helper = "store";
-      git.allowForcePush = true;
-      push.followTags = true;
-      init.defaultBranch = "main";
-    };
-
-    delta.enable = true;
-    delta.options = {
-      features = "decorations";
-      relative-paths = true;
-
-      decorations = {
-        file-style = "yellow";
-        hunk-header-style = "line-number syntax";
-      };
-    };
-  };
 }
diff --git a/home-manager/tools.nix b/home-manager/tools.nix
index aae6f54..2d34974 100644
--- a/home-manager/tools.nix
+++ b/home-manager/tools.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, fullname, email, ... }:
 {
 
   # Password Store
@@ -18,4 +18,34 @@
   programs.mpv.config = {
     osc = false;
   };
+
+  # Git
+
+  programs.git = {
+    enable = true;
+    userName = fullname;
+    userEmail = email;
+
+    signing.key = "6CB106C25E86A9F7";
+    signing.signByDefault = true;
+
+    extraConfig = {
+      github.user = "kiana-S";
+      credential.helper = "store";
+      git.allowForcePush = true;
+      push.followTags = true;
+      init.defaultBranch = "main";
+    };
+
+    delta.enable = true;
+    delta.options = {
+      features = "decorations";
+      relative-paths = true;
+
+      decorations = {
+        file-style = "yellow";
+        hunk-header-style = "line-number syntax";
+      };
+    };
+  };
 }