add delta diff viewer for git

homes/modules/git.nix

@@ -3,72 +3,89 @@
   pkgs,
   ...
 }: {
-  programs.git = {
+  home.packages = with pkgs; [
-    enable = true;
+    delta # git diff viewer
-    lfs.enable = true;
+  ];
 
-    signing = {
+  programs = {
-      # key = "F68745A836CA0412";
+    git = {
-      # format = "openpgp";
+      enable = true;
-      # signByDefault = true;
+      lfs.enable = true;
+
+      signing = {
+        key = "F68745A836CA0412";
+        format = "openpgp";
+        signByDefault = true;
+      };
+
+      settings = {
+        user.name = "_cry64";
+        user.email = "them@dobutterfliescry.net";
+
+        alias = {
+          s = "status";
+          d = "diff";
+          l = "log";
+          c = "commit";
+          p = "push";
+        };
+
+        color.ui = true;
+        core.editor = "hx";
+        github.user = "cry128";
+
+        # delta diff viewer
+        core.pager = "delta";
+        interactive.diffFilter = "delta --color-only";
+        delta = {
+          navigate = true;
+          line-numbers = true;
+          side-by-side = true;
+        };
+        merge.conflictStyle = "zdiff3";
+
+        init = {
+          defaultBranch = "main";
+        };
+        url = {
+          "git@github.com:" = {
+            insteadOf = [
+              "gh:"
+              "github:"
+            ];
+          };
+          "https://gitlab.com/" = {
+            insteadOf = [
+              "gl:"
+              "gitlab:"
+            ];
+          };
+          "git@codeberg.org:" = {
+            insteadOf = [
+              "cb:"
+              "codeberg:"
+            ];
+          };
+          "git@tearforge.net/" = {
+            insteadOf = [
+              "cry:"
+              "forge:"
+            ];
+          };
+        };
+      };
+
+      includes = [
+        {
+          path = "/home/me/agribit/.gitconfig";
+          condition = "gitdir:/home/me/agribit/**";
+        }
+        # {
+        #   path = "/home/me/luminary/.gitconfig";
+        #   condition = "gitdir:/home/me/luminary/**";
+        # }
+      ];
     };
 
-    settings = {
-      user.name = "_cry64";
-      user.email = "them@dobutterfliescry.net";
-
-      alias = {
-        s = "status";
-        d = "diff";
-        l = "log";
-        c = "commit";
-        p = "push";
-      };
-
-      color.ui = true;
-      core.editor = "hx";
-      github.user = "cry128";
-
-      init = {
-        defaultBranch = "main";
-      };
-      url = {
-        "git@github.com:" = {
-          insteadOf = [
-            "gh:"
-            "github:"
-          ];
-        };
-        "https://gitlab.com/" = {
-          insteadOf = [
-            "gl:"
-            "gitlab:"
-          ];
-        };
-        "git@codeberg.org:" = {
-          insteadOf = [
-            "cb:"
-            "codeberg:"
-          ];
-        };
-        "git@tearforge.net/" = {
-          insteadOf = [
-            "cry:"
-            "forge:"
-          ];
-        };
-      };
-    };
-
-    includes = [
-      {
-        path = "/home/me/agribit/.gitconfig";
-        condition = "gitdir:/home/me/agribit/**";
-      }
-      # {
-      #   path = "/home/me/luminary/.gitconfig";
-      #   condition = "gitdir:/home/me/luminary/**";
-      # }
-    ];
   };
 }