From 16880ea285a2ef43ef5c8501304e5de3c0836ecd Mon Sep 17 00:00:00 2001 From: Artem Sheremet Date: Sat, 28 Mar 2026 20:15:34 +0000 Subject: [PATCH] Really make git config nix-darwin-aware TIL lib.mkIf vs lib.optionalAttrs --- modules/futureware.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/futureware.nix b/modules/futureware.nix index dea3136..5f2bfc2 100644 --- a/modules/futureware.nix +++ b/modules/futureware.nix @@ -26,12 +26,12 @@ lib.mkMerge [ }; } - (lib.mkIf hasGitOption { + (lib.optionalAttrs hasGitOption { programs.git.enable = true; programs.git.config = gitConfig; }) - (lib.mkIf (!hasGitOption) { + (lib.optionalAttrs (!hasGitOption) { # nix-darwin environment.etc."gitconfig".text = lib.generators.toGitINI gitConfig; })