From 2ab386ce5c76af7674fd15f4569ce8a97ce05ec6 Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Sun, 30 Jan 2022 12:30:08 +0100
Subject: [PATCH] Added more git config

---
 home/home/pkgs.nix   |  3 ---
 home/modules/git.nix | 48 +++++++++++++++++++++++++++++++++++++++++---
 home/modules/zsh.nix |  1 +
 3 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/home/home/pkgs.nix b/home/home/pkgs.nix
index e2f7824..5c71cfa 100644
--- a/home/home/pkgs.nix
+++ b/home/home/pkgs.nix
@@ -93,7 +93,4 @@ with pkgs; [
   wireshark
   xdg_utils
   youtube-dl
-  git-lfs
-  gitAndTools.hub
-  gitAndTools.lab
 ]
diff --git a/home/modules/git.nix b/home/modules/git.nix
index a6bbc58..533a33d 100644
--- a/home/modules/git.nix
+++ b/home/modules/git.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 with lib;
 let
   cfg = config.dadada.home.git;
@@ -11,17 +11,59 @@ in
     programs.git = {
       enable = true;
       extraConfig = {
+        core = {
+          whitespace = {
+            tab-in-indent = true;
+            tabwidth = 4;
+          };
+          alias = {
+
+          };
+          pager = "delta";
+        };
+        column = {
+          ui = "never";
+        };
+        checkout = {
+          defaultRemote = "origin";
+        };
+        delta = {
+          navigate = true; # use n and N to move between diff sections
+        };
+        diff = {
+          renames = "copies";
+          algorithm = "histogram";
+          colorMoved = "default";
+        };
+        interactive = {
+          diffFilter = "delta --color-only";
+        };
+        merge = {
+          conflictstyle = "diff3";
+        };
         status = {
           short = true;
-          branch = 1;
+          branch = true;
+          showUntrackedFiled = "all";
         };
         commit = {
-          verbose = 1;
+          verbose = true;
         };
         log = {
           date = "iso8601-local";
         };
+        pull = {
+          prune = true;
+        };
       };
     };
+
+    home.packages = with pkgs; [
+      delta
+      git-lfs
+      gitAndTools.hub
+      gitAndTools.lab
+      gitAndTools.git-absorb
+    ];
   };
 }
diff --git a/home/modules/zsh.nix b/home/modules/zsh.nix
index 69d11c5..662782e 100644
--- a/home/modules/zsh.nix
+++ b/home/modules/zsh.nix
@@ -46,6 +46,7 @@ in
         ga = "git add";
         gc = "git commit";
         gd = "git diff";
+        gdw = "git diff --color-words";
         gf = "git fetch";
         gl = "git log";
         gpu = "git push";