diff --git a/home/git/default.nix b/home/git/default.nix index 5a0187d..04d7786 100644 --- a/home/git/default.nix +++ b/home/git/default.nix @@ -120,6 +120,11 @@ in defaultBranch = "main"; }; + # Local configuration, not-versioned + include = { + path = "config.local"; + }; + merge = { conflictStyle = "zdiff3"; };