diff --git a/flake.nix b/flake.nix
index 436ea56..96c59b1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -118,6 +118,7 @@
               home-manager.extraSpecialArgs = { inherit system inputs; };
               home-manager.users.srid = { pkgs, ... }: {
                 imports = [
+                  ./home/git.nix
                   ./home/tmux.nix
                   ./home/neovim.nix
                 ];
diff --git a/home.nix b/home.nix
index 5474dbd..4eb0b6b 100644
--- a/home.nix
+++ b/home.nix
@@ -3,6 +3,7 @@ rec {
   imports = [
     inputs.nix-doom-emacs.hmModule
     ./home/tmux.nix
+    ./home/git.nix
   ];
 
   home.packages = with pkgs; [
@@ -47,7 +48,6 @@ rec {
   ];
 
   programs = {
-    git = import ./home/git.nix;
 
     # Leaving this disabled, as it doesn't look like nix-doom-emacs is being
     # maintained or kept up to date anymore.
diff --git a/home/git.nix b/home/git.nix
index ba2cfba..4ee3bdd 100644
--- a/home/git.nix
+++ b/home/git.nix
@@ -1,26 +1,28 @@
 {
-  # package = pkgs.gitAndTools.gitFull;
-  enable = true;
-  userName = "Sridhar Ratnakumar";
-  userEmail = "srid@srid.ca";
-  aliases = {
-    co = "checkout";
-    ci = "commit";
-    cia = "commit --amend";
-    s = "status";
-    st = "status";
-    b = "branch";
-    p = "pull --rebase";
-    pu = "push";
-  };
-  ignores = [ "*~" "*.swp" ];
-  extraConfig = {
-    init.defaultBranch = "master";
-    #core.editor = "nvim";
-    #protocol.keybase.allow = "always";
-    credential.helper = "store --file ~/.git-credentials";
-    pull.rebase = "false";
-    # For supercede
-    core.symlinks = true;
+  programs.git = {
+    # package = pkgs.gitAndTools.gitFull;
+    enable = true;
+    userName = "Sridhar Ratnakumar";
+    userEmail = "srid@srid.ca";
+    aliases = {
+      co = "checkout";
+      ci = "commit";
+      cia = "commit --amend";
+      s = "status";
+      st = "status";
+      b = "branch";
+      p = "pull --rebase";
+      pu = "push";
+    };
+    ignores = [ "*~" "*.swp" ];
+    extraConfig = {
+      init.defaultBranch = "master"; # based.
+      core.editor = "nvim";
+      #protocol.keybase.allow = "always";
+      credential.helper = "store --file ~/.git-credentials";
+      pull.rebase = "false";
+      # For supercede
+      core.symlinks = true;
+    };
   };
 }