From 8a9041b9bf0e5dc698a03f9f1f4c1f5ef887d5be Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Sat, 3 Dec 2022 14:47:57 -0500
Subject: [PATCH] make git a normal module

---
 home/git.nix           | 5 ++---
 nix-darwin/default.nix | 4 +---
 nixos/default.nix      | 8 ++------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/home/git.nix b/home/git.nix
index f5750df..8e2f358 100644
--- a/home/git.nix
+++ b/home/git.nix
@@ -1,4 +1,3 @@
-{ user }:
 { pkgs, config, flake, ... }:
 {
   home.packages = [ pkgs.git-lfs ];
@@ -6,8 +5,8 @@
   programs.git = {
     package = pkgs.gitAndTools.gitFull;
     enable = true;
-    userName = flake.config.people.users.${user}.name;
-    userEmail = flake.config.people.users.${user}.email;
+    userName = flake.config.people.users.${config.home.username}.name;
+    userEmail = flake.config.people.users.${config.home.username}.email;
     aliases = {
       co = "checkout";
       ci = "commit";
diff --git a/nix-darwin/default.nix b/nix-darwin/default.nix
index dff4db4..8a4f968 100644
--- a/nix-darwin/default.nix
+++ b/nix-darwin/default.nix
@@ -35,9 +35,7 @@
             imports = [
               self.homeModules.common-darwin
               ../home/shellcommon.nix
-              (import ../home/git.nix {
-                user = config.people.myself;
-              })
+              ../home/git.nix
             ];
           };
         }
diff --git a/nixos/default.nix b/nixos/default.nix
index 86816ad..f3414d7 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -26,9 +26,7 @@
           home-manager.users."uday" = {
             imports = [
               self.homeModules.common-linux
-              (import ../home/git.nix {
-                user = "uday";
-              })
+              ../home/git.nix
             ];
           };
         }
@@ -54,9 +52,7 @@
             imports = [
               self.homeModules.common-linux
               ../home/shellcommon.nix
-              (import ../home/git.nix {
-                user = config.people.myself;
-              })
+              ../home/git.nix
             ];
           };
         }