update: git config

milogert · Mar 6, 2024 · 4be7b5c · 4be7b5c
1 parent 33b5f39
commit 4be7b5c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/hosts/_common/home/default.nix b/hosts/_common/home/default.nix
@@ -4,7 +4,7 @@
   imports = [
     ./bat.nix
     ./fzf.nix
-    ./git
+    ./git.nix
     ./lazydocker.nix
     /* ./neovim */
     ./password-store.nix

diff --git a/hosts/_common/home/git/default.nix → hosts/_common/home/git.nix b/hosts/_common/home/git/default.nix → hosts/_common/home/git.nix
@@ -62,14 +62,19 @@
 
       color.ui = true;
       commit.verbose = true;
+      diff.algorithm = "histogram";
       fetch.prune = true;
       grep.lineNumber = true;
       help.autocorrect = 1;
       init.defaultBranch = "main";
       interactive.diffFilter = "delta --dark --color-only";
+      merge.conflictStyle = "zdiff3";
       pull.rebase = false;
+      push.autoSetupRemote = true;
       push.default = "upstream";
 
+      # url."[email protected]".insteadOf = "https://github.com";
+
       delta = {
         features = "decorations";
         line-numbers = true;