all repos — nixfiles @ 5f689657009cc14f916f967075c28596673e2ac4

System and user configuration, managed by nix and home-manager

use srvos's default gitMinimal package where git is used

Alin
commit

5f689657009cc14f916f967075c28596673e2ac4

parent

d010059385cba39105ee2284ec7d504f6d89b136

6 files changed, 6 insertions(+), 8 deletions(-)

changed files
M system/hosts/linde.nix → system/hosts/linde.nix
@@ -116,7 +116,7 @@ wantedBy = [ "nixos-upgrade.service" ];
     path = with pkgs; [
       openssh
       nix
-      gitMinimal
+      config.git.package
     ];
     serviceConfig = {
       Type = "oneshot";

@@ -777,7 +777,6 @@ };
 
   programs.git = {
     enable = true;
-    package = pkgs.gitMinimal;
     config = {
       advice = {
         detachedHead = false;
M system/hosts/smrk.nix → system/hosts/smrk.nix
@@ -84,7 +84,6 @@ ];
   };
   programs.git = {
     enable = true;
-    package = pkgs.gitMinimal;
     config = {
       advice = {
         detachedHead = false;
M system/roles/ci.nix → system/roles/ci.nix
@@ -16,7 +16,7 @@ bash
       gnutar
       bzip2
       gzip
-      git
+      config.programs.git.package
       cached-nix-shell
       nix
       nix-build-uncached
M system/roles/forgejo-runner.nix → system/roles/forgejo-runner.nix
@@ -24,7 +24,7 @@ bash
         coreutils
         curl
         gawk
-        gitMinimal
+        config.programs.git.package
         gnused
         nix
         nodejs
M system/roles/server.nix → system/roles/server.nix
@@ -37,7 +37,7 @@ startAt = "weekly";
     path = with pkgs; [
       openssh
       nix
-      git
+      config.programs.git.package
     ];
     serviceConfig = rec {
       Type = "oneshot";
M system/settings/services/git-server.nix → system/settings/services/git-server.nix
@@ -79,14 +79,14 @@ { hostname, username }:
     {
       "mirror-to-${name}@" = {
         path = with pkgs; [
-          gitMinimal
+          config.programs.git.package
           openssh
         ];
         serviceConfig = {
           Type = "oneshot";
           User = "gitolite";
           WorkingDirectory = "${repos}/%i.git";
-          ExecStart = "${pkgs.gitMinimal}/bin/git push --mirror git@${hostname}:${username}/%i";
+          ExecStart = "${config.programs.git.package}/bin/git push --mirror git@${hostname}:${username}/%i";
         };
         unitConfig = {
           # only mirror public repositories