1 files changed, 50 insertions, 53 deletions

diff --git a/modules/git.home.nix b/modules/git.home.nix
index 602e745..37dc7af 100644
--- a/modules/git.home.nix
+++ b/modules/git.home.nix
@@ -3,10 +3,9 @@
   programs.gh = {
     enable = true;
     extensions = with pkgs; [
-      gh-copilot
       gh-poi
-      # gh-dash
       gh-notify
+      # gh-dash
     ];
     settings = {
       aliases = {
@@ -17,33 +16,25 @@
     };
   };
 
-  # programs.gh-dash = {
-  #   enable = true;
-  #   settings = {
-  #     defaults = {
-  #       preview = {
-  #         open = true;
-  #         width = 80;
-  #       };
-  #     };
-  #     pager = { diff = "delta"; };
-  #     keybindings = {
-  #       prs = [
-  #         { key = "m"; command = "echo accident"; }
-  #         { key = "x"; command = "echo accident"; }
-  #         { key = "a"; command = "echo accident"; }
-  #         { key = "A"; command = "echo accident"; }
-  #         { key = "W"; command = "echo accident"; }
-  #         { key = "X"; command = "echo accident"; }
-  #       ];
-  #     };
-  #   };
-  # };
+  programs.delta = {
+    enable = true;
+    enableGitIntegration = true;
+    options = {
+      navigate = true;
+      dark = true;
+      side-by-side = true;
+      line-numbers = true;
+      hyperlinks = true;
+      paging = "always";
+      diff-so-fancy = true;
+      file-decoration-style = "brightcyan bold ol ul";
+      file-style = "brightcyan";
+      hunk-header-decoration-style = "white ul";
+    };
+  };
 
   programs.git = {
     enable = true;
-    userEmail = "phenax5@gmail.com";
-    userName = "Akshay Nair";
     ignores = [
       "tags"
       ".vim.session"
@@ -54,29 +45,14 @@
       ".local.lua"
       ".nvim.lua"
     ];
-    aliases = {
-      ignore = "!gi() { curl -sL https://www.toptal.com/developers/gitignore/api/$@ ;}; gi";
-      dshow = "-c diff.external='difft --display side-by-side-show-both' show --ext-diff";
-      ddiff = "-c diff.external='difft --display side-by-side-show-both' diff";
-    };
-    delta = {
-      enable = true;
-      # package = pkgs.delta;
-      options = {
-        navigate = true;
-        side-by-side = true;
-        line-numbers = true;
-        hyperlinks = true;
-        paging = "always";
+    settings = {
+      user.email = "phenax5@gmail.com";
+      user.name = "Akshay Nair";
+      alias = {
+        ignore = "!gi() { curl -sL https://www.toptal.com/developers/gitignore/api/$@ ;}; gi";
+        dshow = "-c diff.external='difft --display side-by-side-show-both' show --ext-diff";
+        ddiff = "-c diff.external='difft --display side-by-side-show-both' diff";
       };
-    };
-    # difftastic = {
-    #   enable = true;
-    #   display = "side-by-side";
-    #   color = "auto";
-    #   background = "dark";
-    # };
-    extraConfig = {
       color = {
         ui = true;
       };
@@ -99,15 +75,36 @@
       };
       pull.rebase = true;
       rebase.autosquash = true;
-      # pager = {
-      #   diff = "${pkgs.delta}/bin/delta --color-only";
-      # };
-      diff.tool = "nvimdiff";
-      merge.tool = "nvimdiff";
+      # diff.tool = "nvimdiff";
+      # merge.tool = "nvimdiff";
+      merge.conflictStyle = "zdiff3";
       difftool.prompt = false;
       mergetool.prompt = false;
     };
     signing.key = "AAAB13AE8B82A5267C1A35D7E1B701723EA37849";
     signing.signByDefault = true;
   };
+
+  # programs.gh-dash = {
+  #   enable = true;
+  #   settings = {
+  #     defaults = {
+  #       preview = {
+  #         open = true;
+  #         width = 80;
+  #       };
+  #     };
+  #     pager = { diff = "delta"; };
+  #     keybindings = {
+  #       prs = [
+  #         { key = "m"; command = "echo accident"; }
+  #         { key = "x"; command = "echo accident"; }
+  #         { key = "a"; command = "echo accident"; }
+  #         { key = "A"; command = "echo accident"; }
+  #         { key = "W"; command = "echo accident"; }
+  #         { key = "X"; command = "echo accident"; }
+  #       ];
+  #     };
+  #   };
+  # };
 }