Git changes (#331)

* Change merge conflict style algorithm * Setup delta git pager * Use delta as lazygit's pager
francishamel · Nov 27, 2024 · 53d8358 · 53d8358
1 parent da190bb
commit 53d8358
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/home-manager/modules/git.nix b/home-manager/modules/git.nix
@@ -17,14 +17,23 @@
       enable = true;
       extraConfig = {
         init.defaultBranch = "main";
-        merge.conflictstyle = "diff3";
+        merge.conflictstyle = "zdiff3";
         pull.rebase = true;
         rebase = {
           autoStash = true;
           autosquash = true;
         };
         rerere.enabled = true;
       };
+      delta = {
+        enable = true;
+        options = {
+          line-numbers = true;
+          navigate = true;
+          side-by-side = true;
+          theme = "Nord";
+        };
+      };
     };
 
     gh = {
@@ -44,7 +53,13 @@
       };
     };
 
-    lazygit.enable = true;
+    lazygit = {
+      enable = true;
+      settings = {
+        git.paging.pager = "${config.programs.git.delta.package}/bin/delta --dark --paging=never";
+        gui.nerdFontsVersion = "3";
+      };
+    };
 
     zsh.shellAliases.lg = "${pkgs.lazygit}/bin/lazygit";
   };