diff options
| author | Skullheadx <andrew@andrew-montgomery.dev> | 2026-06-30 12:43:03 -0400 |
|---|---|---|
| committer | Skullheadx <andrew@andrew-montgomery.dev> | 2026-06-30 12:43:03 -0400 |
| commit | 98103d38c525791228da1e3fcbb1021e6c02cfce (patch) | |
| tree | b16a801edfb74c60353b75d0b0e0b3de86957477 | |
| parent | add more utilities to darwin (diff) | |
| download | nixos-98103d38c525791228da1e3fcbb1021e6c02cfce.tar.gz nixos-98103d38c525791228da1e3fcbb1021e6c02cfce.tar.bz2 nixos-98103d38c525791228da1e3fcbb1021e6c02cfce.zip | |
try git delta
| -rw-r--r-- | dotfiles/git/config | 22 | ||||
| -rw-r--r-- | hjem-darwin.nix | 2 |
2 files changed, 24 insertions, 0 deletions
diff --git a/dotfiles/git/config b/dotfiles/git/config new file mode 100644 index 0000000..feaae67 --- /dev/null +++ b/dotfiles/git/config @@ -0,0 +1,22 @@ +[user] + name = Skullheadx + email = andrew@andrew-montgomery.dev + +[pull] + rebase = true + +[url "git@github.com:"] + insteadOf = https://github.com/ + +[core] + pager = delta + +[interactive] + diffFilter = delta --color-only + +[delta] + navigate = true + dark = true + +[merge] + conflictStyle = zdiff3 diff --git a/hjem-darwin.nix b/hjem-darwin.nix index ac3bab9..b066259 100644 --- a/hjem-darwin.nix +++ b/hjem-darwin.nix @@ -11,9 +11,11 @@ directory = "/Users/${username}"; files = { ".config/ghostty/config.ghostty".source = ./dotfiles/ghostty/config.ghostty; + ".config/git/config".source = ./dotfiles/git/config; }; packages = with pkgs; [ + delta ]; }; } |