From 1367b87f0c8488e45f217e9214b98fe15756a782 Mon Sep 17 00:00:00 2001 From: winston Date: Wed, 15 Feb 2023 21:47:27 +0100 Subject: [PATCH] fix(git): don't override pkg on linux --- modules/git.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/git.nix b/modules/git.nix index b8d46f0..3fe9f6c 100644 --- a/modules/git.nix +++ b/modules/git.nix @@ -1,4 +1,6 @@ -{pkgs, ...}: { +{pkgs, ...}: let + inherit (pkgs.stdenv.hostPlatform) isDarwin; +in { programs.git = { enable = true; userName = "winston"; @@ -27,7 +29,10 @@ ]; # disable the macOS keychain, only use gopass - package = pkgs.git.override {osxkeychainSupport = false;}; + package = + if isDarwin + then (pkgs.git.override {osxkeychainSupport = false;}) + else pkgs.git; extraConfig = { credential.helper = "gopass";