1 files changed, 30 insertions, 29 deletions

diff --git a/home/profiles/git.nix b/home/profiles/git.nix
index c88705c..4821498 100644
--- a/home/profiles/git.nix
+++ b/home/profiles/git.nix
@@ -10,40 +10,22 @@ in
 {
   home.packages = with pkgs; [
     git-credential-manager
-    gitAndTools.pre-commit
+    pre-commit
   ];
 
-  programs.git = {
+  programs.delta = {
     enable = true;
+    options.features = "decorations side-by-side line-numbers";
+  };
 
-    delta = {
-      enable = true;
-      options.features = "decorations side-by-side line-numbers";
-    };
-
-    userName = lib.mkDefault userinfo.fullName;
-    userEmail = lib.mkDefault userinfo.email;
-
-    aliases = {
-      amend = "commit --amend";
-      a = "commit --amend --no-edit";
-      st = "status";
-      co = "checkout";
-      br = "branch";
-      rb = "pull --rebase";
-      hist = "log --pretty=format:\"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)\" --graph --date=relative --decorate --all";
-      llog = "log --graph --name-status --pretty=format:\"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset\" --date=relative";
-      logo = "log --pretty=format:\"%C(yellow)%h%Cred%d %Creset%s%Cblue (%cn)\" --decorate";
-      logf = "log --pretty=format:\"%C(yellow)%h%Cred%d %Creset%s%Cblue (%cn)\" --decorate --numstat";
-    };
-
-    ignores = [
-      ".DS_Store"
-      ".aider.*"
-      ".direnv"
-    ];
+  programs.git = {
+    enable = true;
+    settings = {
+      user = {
+        name = lib.mkDefault userinfo.fullName;
+        email = lib.mkDefault userinfo.email;
+      };
 
-    extraConfig = {
       core.whitespace = "trailing-space,space-before-tab";
       color.ui = true;
 
@@ -85,6 +67,25 @@ in
         autosetuprebase = "remote";
         sort = "authordate";
       };
+
+      aliases = {
+        amend = "commit --amend";
+        a = "commit --amend --no-edit";
+        st = "status";
+        co = "checkout";
+        br = "branch";
+        rb = "pull --rebase";
+        hist = "log --pretty=format:\"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)\" --graph --date=relative --decorate --all";
+        llog = "log --graph --name-status --pretty=format:\"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset\" --date=relative";
+        logo = "log --pretty=format:\"%C(yellow)%h%Cred%d %Creset%s%Cblue (%cn)\" --decorate";
+        logf = "log --pretty=format:\"%C(yellow)%h%Cred%d %Creset%s%Cblue (%cn)\" --decorate --numstat";
+      };
     };
+
+    ignores = [
+      ".DS_Store"
+      ".aider.*"
+      ".direnv"
+    ];
   };
 }