diff --git a/homes/x86_64-linux/rafiq/cli.nix b/homes/x86_64-linux/rafiq/cli.nix
index 9e28696..942a8f6 100644
--- a/homes/x86_64-linux/rafiq/cli.nix
+++ b/homes/x86_64-linux/rafiq/cli.nix
@@ -1,7 +1,6 @@
 { config, lib, pkgs, osConfig, ... }:
 {
   imports = [
-    ./cli/git.nix
     ./cli/zsh.nix
   ];
 
diff --git a/homes/x86_64-linux/rafiq/default.nix b/homes/x86_64-linux/rafiq/default.nix
index f3a9f9b..f79cd78 100644
--- a/homes/x86_64-linux/rafiq/default.nix
+++ b/homes/x86_64-linux/rafiq/default.nix
@@ -8,6 +8,9 @@
 
   cli.editor = "nvf";
   cli.file-browser = "yazi";
+  cli.git.name = "Mohammad Rafiq";
+  cli.git.email = "rafiq@rrv.sh";
+  cli.git.defaultBranch = "prime";
 
   home.shellAliases.v = "nvim";
   home.shellAliases = {
diff --git a/modules/home/cli/default.nix b/modules/home/cli/default.nix
index 0ef6e07..c71af3a 100644
--- a/modules/home/cli/default.nix
+++ b/modules/home/cli/default.nix
@@ -3,6 +3,7 @@
   imports = [
     ./file-browser/yazi.nix
     ./editor/nvf.nix
+    ./utilities/git.nix
   ];
 
   options.cli =	{
diff --git a/homes/x86_64-linux/rafiq/cli/git.nix b/modules/home/cli/utilities/git.nix
similarity index 62%
rename from homes/x86_64-linux/rafiq/cli/git.nix
rename to modules/home/cli/utilities/git.nix
index b0f4a84..1f0d337 100644
--- a/homes/x86_64-linux/rafiq/cli/git.nix
+++ b/modules/home/cli/utilities/git.nix
@@ -1,5 +1,12 @@
 {lib,config,...}:
 {
+  options.cli.git = {
+    name = lib.pantheon.mkStrOption;
+    email = lib.pantheon.mkStrOption;
+    defaultBranch = lib.pantheon.mkStrOption;
+  };
+
+  config = {
   home.sessionVariables.GIT_CONFIG_GLOBAL = "$HOME/.config/git/config";
   home.shellAliases = {
     gs = "git status";
@@ -10,16 +17,17 @@
   };
   programs.git = {
     enable = true;
-    userName = "Mohammad Rafiq";
-    userEmail = "rafiq@rrv.sh";
+    userName = config.cli.git.name;
+    userEmail = config.cli.git.email;
     signing.key = "~/.ssh/id_ed25519.pub";
     signing.signByDefault = true;
     extraConfig = {
-      init.defaultBranch = "prime";
+      init.defaultBranch = config.cli.git.defaultBranch;
       push.autoSetupRemote = true;
       pull.rebase = false;
       core.editor = "$EDITOR";
       gpg.format = "ssh";
     };
   };
+  };
 }