From a2e146ac60917daf55594cf4b8b1526a7b7cf409 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <3998+srid@users.noreply.github.com>
Date: Fri, 31 Oct 2025 13:18:41 -0400
Subject: [PATCH] fix warnings

---
 modules/home/all/git.nix | 50 ++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/modules/home/all/git.nix b/modules/home/all/git.nix
index c333882..5666faf 100644
--- a/modules/home/all/git.nix
+++ b/modules/home/all/git.nix
@@ -6,31 +6,23 @@
 
   programs.git = {
     enable = true;
-    delta = {
-      enable = true;
-      options = {
-        navigate = true;
-        light = false;
-        side-by-side = true;
-        line-numbers = true;
-        pager = "${pkgs.less}/bin/less --mouse --wheel-lines=3";
-      };
-    };
-    userName = flake.config.me.fullname;
-    userEmail = flake.config.me.email;
-    aliases = {
-      co = "checkout";
-      ci = "commit";
-      cia = "commit --amend";
-      s = "status";
-      st = "status";
-      b = "branch";
-      # p = "pull --rebase";
-      pu = "push";
-    };
     ignores = [ "*~" "*.swp" ];
     lfs.enable = true;
-    extraConfig = {
+    settings = {
+      user = {
+        name = flake.config.me.fullname;
+        email = flake.config.me.email;
+      };
+      alias = {
+        co = "checkout";
+        ci = "commit";
+        cia = "commit --amend";
+        s = "status";
+        st = "status";
+        b = "branch";
+        # p = "pull --rebase";
+        pu = "push";
+      };
       init.defaultBranch = "master"; # Undo breakage due to https://srid.ca/luxury-belief
       #protocol.keybase.allow = "always";
       credential.helper = "store --file ~/.git-credentials";
@@ -44,6 +36,18 @@
     };
   };
 
+  programs.delta = {
+    enable = true;
+    enableGitIntegration = true;
+    options = {
+      navigate = true;
+      light = false;
+      side-by-side = true;
+      line-numbers = true;
+      pager = "${pkgs.less}/bin/less --mouse --wheel-lines=3";
+    };
+  };
+
   programs.lazygit = {
     enable = true;
     settings = {