From 909d3b9b210abf86f67b1354d19bb1aa9c3d6033 Mon Sep 17 00:00:00 2001 From: Martin Berg Alstad Date: Sat, 1 Mar 2025 23:00:24 +0100 Subject: [PATCH] :sparkles: Use same package of git --- home-manager/development/git.nix | 50 +++++++++++++++++--------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/home-manager/development/git.nix b/home-manager/development/git.nix index eedb85f..dc7673c 100644 --- a/home-manager/development/git.nix +++ b/home-manager/development/git.nix @@ -1,31 +1,33 @@ { pkgs, ... }: { - home.packages = with pkgs; [ - git-crypt - libsecret - ]; + home.packages = with pkgs; [ git-crypt ]; - programs.git = { - enable = true; - userName = "Martin Berg Alstad"; - userEmail = "git@martials.no"; + programs.git = + let + package = pkgs.git.override { withLibsecret = true; }; + in + { + enable = true; + package = package; + userName = "Martin Berg Alstad"; + userEmail = "git@martials.no"; - aliases = { - amend = "commit --amend"; - cm = "commit"; - s = "status"; + aliases = { + amend = "commit --amend"; + cm = "commit"; + s = "status"; + }; + + signing = { + signByDefault = true; + key = "706F53DD087A91DE"; + }; + + extraConfig = { + push.autoSetupRemote = true; + safe.directory = "/etc/nixos"; + credential.helper = "${package}/bin/git-credential-libsecret"; + }; }; - - signing = { - signByDefault = true; - key = "706F53DD087A91DE"; - }; - - extraConfig = { - push.autoSetupRemote = true; - safe.directory = "/etc/nixos"; - credential.helper = "${pkgs.git.override { withLibsecret = true; }}/bin/git-credential-libsecret"; - }; - }; }