From 6bc1c616fa4d9b9848241bf8518ccb8fa7f771d7 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Fri, 22 Mar 2024 19:06:14 -0400
Subject: [PATCH] refactor

---
 nix-darwin/ci.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/nix-darwin/ci.nix b/nix-darwin/ci.nix
index 1e9161e..976f124 100644
--- a/nix-darwin/ci.nix
+++ b/nix-darwin/ci.nix
@@ -16,19 +16,23 @@
           # https://docs.github.com/en/rest/actions/self-hosted-runners?apiVersion=2022-11-28#list-self-hosted-runners-for-an-organization
           tokenFile = "/run/mykeys/gh-token-runner";
           extraPackages = with pkgs; [
+            # Standard nix tools
             nixci
             cachix
-            which
+
+            # For nixos-flake
+            sd
+
+            # Tools already available in standard GitHub Runners; so we provide
+            # them here:
             coreutils
+            which
+            jq
             # https://github.com/actions/upload-pages-artifact/blob/56afc609e74202658d3ffba0e8f6dda462b719fa/action.yml#L40
             (pkgs.runCommandNoCC "gtar" { } ''
               mkdir -p $out/bin
               ln -s ${lib.getExe pkgs.gnutar} $out/bin/gtar
             '')
-            # For nixos-flake
-            sd
-            # Some useful tools
-            jq
           ];
         };
         repos = {