1 files changed, 8 insertions, 6 deletions

diff --git a/programs/git.nix b/programs/git.nix
index e4b5e0f..d4fac67 100644
--- a/programs/git.nix
+++ b/programs/git.nix
@@ -19,7 +19,13 @@ with theme;
         syntax-theme = "none";
         zero-style = "8";
         navigate = "true";
+        line-numbers = "true";
         keep-plus-minus-markers = "true";
+        line-numbers-zero-style = "8";
+        line-numbers-left-style = "8";
+        line-numbers-right-style = "8";
+        line-numbers-minus-style = "${base08}";
+        line-numbers-plus-style = "${base0B}";
         decorations = {
           file-decoration-style = "none";
           whitespace-error-style = "22 reverse";
@@ -27,7 +33,7 @@ with theme;
           minus-emph-style = "${base08} bold";
           plus-style = "${base0B}";
           plus-emph-style = "${base0B} bold";
-          file-style = "7 italic";
+          file-style = "7 bold";
           hunk-header-style = "7";
           hunk-header-decoration-style = "8 ul";
         };
@@ -39,11 +45,6 @@ with theme;
         };
       };
     };
-    # difftastic = {
-    #   enable = true;
-    #   background = "dark";
-    #   display = "inline";
-    # };
     aliases = {
       co = "checkout";
       rb = "rebase";
@@ -67,6 +68,7 @@ with theme;
         enabled = true;
         autoUpdate = true;
       };
+      merge.conflictstyle = "diff3";
     };
   };
 }