From 761813550c320395bc83e099e3fd43ed059b2824 Mon Sep 17 00:00:00 2001
From: Matt Nish-Lapidus <matt@emenel.ca>
Date: Sun, 13 Jul 2025 16:12:17 -0400
Subject: [PATCH] delta settings

* assets/binary-installers/excite_cymbal_pro-v1.0
---
 modules/home/git-conf.nix   | 16 ++++++++++------
 modules/home/shell-conf.nix | 34 +++-------------------------------
 2 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/modules/home/git-conf.nix b/modules/home/git-conf.nix
index c20fac4..22d2007 100644
--- a/modules/home/git-conf.nix
+++ b/modules/home/git-conf.nix
@@ -17,6 +17,15 @@
     ignores = [
       ".DS_Store"
     ];
+    delta = {
+      enable = true;
+      options = {
+        navigate = true;
+        dark = true;
+        line-numbers = true;
+        side-by-side = false;
+      };
+    };
     extraConfig = {
       core = {
         editor = "$EDITOR";
@@ -25,14 +34,9 @@
       interactive = {
         diffFilter = "${pkgs.delta}/bin/delta --color-only";
       };
-      delta = {
-        navigate = true;
-        dark = true;
-        line-numbers = true;
-        side-by-side = true;
-      };
       merge = {
         conflictstyle = "zdiff3";
+
       };
       init = {
         defaultBranch = "main";
diff --git a/modules/home/shell-conf.nix b/modules/home/shell-conf.nix
index 1796b18..cff65ff 100644
--- a/modules/home/shell-conf.nix
+++ b/modules/home/shell-conf.nix
@@ -174,9 +174,9 @@
       enable = true;
       settings = {
         nerdFontsVersion = "3";
-        # git = {
-        #   paging.pager = "delta --paging=never";
-        # };
+        git = {
+          paging.pager = "delta --paging=never";
+        };
       };
     };
     jq.enable = true;
@@ -184,34 +184,6 @@
       enable = true;
       package = pkgs.rbw;
     };
-    gitui = {
-      enable = true;
-      theme = ''
-  (
-    selected_tab: Reset,
-    command_fg: Black,
-    selection_bg: Blue,
-    selection_fg: White,
-    cmdbar_bg: Blue,
-    cmdbar_extra_lines_bg: Blue,
-    disabled_fg: DarkGray,
-    diff_line_add: Green,
-    diff_line_delete: Red,
-    diff_file_added: LightGreen,
-    diff_file_removed: LightRed,
-    diff_file_moved: LightMagenta,
-    diff_file_modified: Yellow,
-    commit_hash: Magenta,
-    commit_time: LightCyan,
-    commit_author: Green,
-    danger_fg: Red,
-    push_gauge_bg: Blue,
-    push_gauge_fg: Reset,
-    tag_fg: LightMagenta,
-    branch_fg: LightYellow,
-  )
-'';
-    };
   };
 
   xdg.configFile."starship.toml".source = ./shell-conf/starship/starship.toml;