From 0204f97ee8bb4afaa95bc8609ff212648e600f5d Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Tue, 26 Mar 2024 14:32:46 -0400
Subject: [PATCH] Refactor

---
 systems/github-runner.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/systems/github-runner.nix b/systems/github-runner.nix
index d044e96..cb8d1a8 100644
--- a/systems/github-runner.nix
+++ b/systems/github-runner.nix
@@ -1,13 +1,17 @@
 # TODO: WIP
 # - [x] Intial config
-# - [ ] Colmena deploy, with keys from 1Password.
-# - [ ] Github Runners
+# - [x] Colmena deploy, with keys from 1Password.
+# - [x] Github Runners
 # - [ ] Distributed builder to host (macOS)
+# - [ ] Refactor, to allow multiple repos (then remove easy-github-runners.nix)
 { flake, pkgs, ... }:
 
 let
   inherit (flake) inputs;
   inherit (inputs) self;
+  user = "github-runner";
+  group = "github-runner";
+  tokenFile = "/run/keys/github-runner-token.secret";  # See colmena keys in top-level flake.nix
 in
 {
   imports = [
@@ -32,23 +36,21 @@ in
   services.openssh.enable = true;
 
   # Runners
-  users.users.github-runner = {
+  users.users.${user} = {
+    inherit group;
     isSystemUser = true;
-    group = "github-runner";
   };
-  users.groups.github-runner = { };
-  nix.settings.trusted-users = [ "github-runner" ];
+  users.groups.${group} = { };
+  nix.settings.trusted-users = [ user ];
   services.github-runners = {
     perpetuum = {
+      inherit user group tokenFile;
       enable = true;
       replace = true;
-      tokenFile = "/run/keys/github-runner-token.secret";
       extraPackages = with pkgs; [
         coreutils
         nixci
       ];
-      user = "github-runner";
-      group = "github-runner";
       url = "https://github.com/srid/perpetuum";
       name = "perpetuum-1";
     };