From 938fb71f9c1e403d0abfedf6e9473a03374248bf Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Wed, 8 Feb 2023 14:31:29 +0000 Subject: [PATCH] home: git: include local-only config file Useful for configuration options that should remain secret. --- home/git/default.nix | 5 +++++ 1 file changed, 5 insertions(+) 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"; };