diff --git a/homes/x86_64-linux/rafiq/default.nix b/homes/x86_64-linux/rafiq/default.nix
index 363d8ea..23d39fb 100644
--- a/homes/x86_64-linux/rafiq/default.nix
+++ b/homes/x86_64-linux/rafiq/default.nix
@@ -1,13 +1,16 @@
 { config, pkgs, osConfig, ... }:
 
 {
+  imports = [
+    ./programs/git.nix
+  ];
+
   home.stateVersion = "24.11";
 
   home.file = {
   };
 
   home.packages = with pkgs; [
-    git
     neovim
     ripgrep
   ];
@@ -22,27 +25,4 @@ directories = [
 ];
 allowOther = true;
   };
-
-  home.sessionVariables.GIT_CONFIG_GLOBAL = "$HOME/.config/git/config";
-  home.shellAliases = {
-    gs = "git status";
-    gc = "git commit";
-    gcam = "git commit -am";
-    gu = "git push";
-    gy = "git pull";
-  };
-  programs.git = {
-    enable = true;
-    userName = "Mohammad Rafiq";
-    userEmail = "rafiq@rrv.sh";
-    signing.key = "~/.ssh/id_ed25519.pub";
-    signing.signByDefault = true;
-    extraConfig = {
-      init.defaultBranch = "prime";
-      push.autoSetupRemote = true;
-      pull.rebase = false;
-      core.editor = "$EDITOR";
-      gpg.format = "ssh";
-    };
-  };
 }
diff --git a/homes/x86_64-linux/rafiq/programs/git.nix b/homes/x86_64-linux/rafiq/programs/git.nix
new file mode 100644
index 0000000..b0f4a84
--- /dev/null
+++ b/homes/x86_64-linux/rafiq/programs/git.nix
@@ -0,0 +1,25 @@
+{lib,config,...}:
+{
+  home.sessionVariables.GIT_CONFIG_GLOBAL = "$HOME/.config/git/config";
+  home.shellAliases = {
+    gs = "git status";
+    gc = "git commit";
+    gcam = "git commit -am";
+    gu = "git push";
+    gy = "git pull";
+  };
+  programs.git = {
+    enable = true;
+    userName = "Mohammad Rafiq";
+    userEmail = "rafiq@rrv.sh";
+    signing.key = "~/.ssh/id_ed25519.pub";
+    signing.signByDefault = true;
+    extraConfig = {
+      init.defaultBranch = "prime";
+      push.autoSetupRemote = true;
+      pull.rebase = false;
+      core.editor = "$EDITOR";
+      gpg.format = "ssh";
+    };
+  };
+}