From 729867c326cb8ee4e1629279ad2b951d45e124a7 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Wed, 27 Mar 2024 10:05:42 -0400
Subject: [PATCH] refactor: decouple runner pkgs

---
 clusters/github-runner/nixos-module.nix | 15 ++-------------
 clusters/github-runner/runner-pkgs.nix  | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 13 deletions(-)
 create mode 100644 clusters/github-runner/runner-pkgs.nix

diff --git a/clusters/github-runner/nixos-module.nix b/clusters/github-runner/nixos-module.nix
index a0960fc..6af80a4 100644
--- a/clusters/github-runner/nixos-module.nix
+++ b/clusters/github-runner/nixos-module.nix
@@ -7,6 +7,7 @@ let
   group = "github-runner";
   tokenFile = "/run/keys/github-runner-token.secret"; # See colmena keys in top-level flake.nix
   repos = import ./repos.nix;
+  runner-pkgs = (import ./runner-pkgs.nix { inherit pkgs lib; });
   # Convenient function to create multiple runners per single personal repo.
   mkPersonalRunners = user:
     lib.concatMapAttrs (repoName: meta:
@@ -18,24 +19,12 @@ let
           inherit user group tokenFile name;
           enable = true;
           replace = true;
-          extraPackages = with pkgs; [
+          extraPackages = with pkgs; runner-pkgs ++ [
             # Standard nix tools
             nixci
             cachix
-
             # 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
-            '')
           ];
           url = "https://github.com/${user}/${repoName}";
         })));
diff --git a/clusters/github-runner/runner-pkgs.nix b/clusters/github-runner/runner-pkgs.nix
new file mode 100644
index 0000000..3b2616a
--- /dev/null
+++ b/clusters/github-runner/runner-pkgs.nix
@@ -0,0 +1,14 @@
+{ pkgs, lib, ... }:
+
+# Tools already available in standard GitHub Runners; so we provide
+# them here:
+with pkgs; [
+  coreutils
+  which
+  jq
+  # https://github.com/actions/upload-pages-artifact/blob/56afc609e74202658d3ffba0e8f6dda462b719fa/action.yml#L40
+  (runCommandNoCC "gtar" { } ''
+    mkdir -p $out/bin
+    ln -s ${lib.getExe gnutar} $out/bin/gtar
+  '')
+]