chore: update flake.lock

flake.lock

@@ -45,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1793193205,
-        "narHash": "sha256-X6xa6sGA7RnJQuZGbFMC+K+KToWAlBDCCjJXfTwEPsw=",
+        "lastModified": 1793979366,
+        "narHash": "sha256-7OoWDsYO9teiPxl0QdlS5lYE20Pue8/5mpscSL32FUA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "095fef2f265c3c0da4fe315efba8f8a04495ab34",
+        "rev": "2c0c1f01521469cf0271180c453c79782d53c2f6",
         "type": "github"
       },
       "original": {
@@ -85,11 +85,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1793236063,
-        "narHash": "sha256-jGFe4xdrCw6xpgH2zgKwslACyt/NGuPwGILPEMFxmcQ=",
+        "lastModified": 1793871777,
+        "narHash": "sha256-DbFyxXHjP4SJDWVVIILkgrUZxj29cDusi8ULXoQGuZ8=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "b6754c901c21478fd8450d62101e712b2a4f0d75",
+        "rev": "d645c71a58dbae3eb17ff551a07aea13a541cb1a",
         "type": "github"
       },
       "original": {
@@ -114,11 +114,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1793315900,
-        "narHash": "sha256-z5lZoCwheBzMgRtfYlGLMhmPwhv1Rty16Kf269n8ctc=",
+        "lastModified": 1794008981,
+        "narHash": "sha256-cKbcgAgDWAKHRE6vK/uxl+S64yubo7ERes9x6fEWmfw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "db379a58acfef9783b46ffde2957dac397c92b85",
+        "rev": "6e80156f14a63697db078e43473999c01cb0ea6a",
         "type": "github"
       },
       "original": {
@@ -146,11 +146,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1793110635,
-        "narHash": "sha256-dhoW6VgFWlaodSY5jrBn+CF2FLmaUvDVgM7+C7T2+NM=",
+        "lastModified": 1793726008,
+        "narHash": "sha256-jQp1wKvbwWdLBASTXkSi/VYmDJ5AbBi1WvcMt9HWJC8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "31ecbaca1bdefa45dffc409f0250bd8039ea0010",
+        "rev": "1d060086d60cb76a40cf37109f979d88a5bd6396",
         "type": "github"
       },
       "original": {
@@ -201,11 +201,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1793052255,
-        "narHash": "sha256-Y/JIHTnMlOabDfyaSBubWGLDIVGihLEUuoMhFvQKaDo=",
+        "lastModified": 1793995029,
+        "narHash": "sha256-ZlE4BtMjWhfC6rFXLO9Qimn36Ene1INqCgKDDvazjhc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "60182817ee048ac94b4c68ea76d5ef2e8aac730d",
+        "rev": "89a234ce2daf6e568a7d4b4fe250afdd23d84e20",
         "type": "github"
       },
       "original": {

systems/jeeves/runners/register_gitea_runner.sh

@@ -1,38 +1,21 @@
 #!/usr/bin/env bash
 
-# Newer runner modules export INSTANCE_DIR and multiple colon-separated state paths.
-instance_dir="${INSTANCE_DIR:-${STATE_DIRECTORY%%:*}/$1}"
-legacy_instance_dir="$(dirname "$instance_dir")/$(hostname)"
+legacy_instance_dir="$STATE_DIRECTORY/$(hostname)"
+instance_dir="$STATE_DIRECTORY/$1"
 runner_url="$2"
 runner_config_file="$3"
 shift 3
 runner_labels="$(IFS=,; printf '%s' "$*")"
 
-if [ "$legacy_instance_dir" != "$instance_dir" ] && [ -d "$legacy_instance_dir" ]; then
-  # systemd may have already created an empty instance directory.
-  if [ ! -e "$instance_dir" ] || rmdir "$instance_dir" 2>/dev/null; then
-    mv "$legacy_instance_dir" "$instance_dir"
-  fi
+if [ ! -e "$instance_dir" ] && [ -d "$legacy_instance_dir" ]; then
+  mv "$legacy_instance_dir" "$instance_dir"
 fi
 
 mkdir -vp "$instance_dir"
 cd "$instance_dir" || exit 1
 
-# Newer modules use LoadCredential; older ones export TOKEN via EnvironmentFile.
-runner_token="${TOKEN:-}"
-if [ -n "${CREDENTIALS_DIRECTORY:-}" ]; then
-  runner_token="$(cat "$CREDENTIALS_DIRECTORY/token")"
-  # Keep accepting the legacy TOKEN= format as well as a raw token.
-  while IFS= read -r token_line; do
-    if [[ "$token_line" =~ ^[[:space:]]*TOKEN= ]]; then
-      runner_token="${token_line#*=}"
-    fi
-  done <<< "$runner_token"
-fi
-: "${runner_token:?Runner registration token is missing}"
-
 token_hash_file="$instance_dir/.token-hash"
-token_hash_current="$(printf '%s' "$runner_token" | sha256sum | cut -d' ' -f1)"
+token_hash_current="$(printf '%s' "$TOKEN" | sha256sum | cut -d' ' -f1)"
 token_hash_stored="$(cat "$token_hash_file" 2>/dev/null || echo "")"
 labels_file="$instance_dir/.labels"
 labels_wanted="$(printf '%s\n' "$@" | sort)"
@@ -43,7 +26,7 @@ if [ ! -e "$instance_dir/.runner" ] || [ "$labels_wanted" != "$labels_current" ]
 
   gitea-runner register --no-interactive \
     --instance "$runner_url" \
-    --token "$runner_token" \
+    --token "$TOKEN" \
     --name "jeeves-$(hostname)" \
     --labels "$runner_labels" \
     --config "$runner_config_file"