diff --git a/hosts/myself/default.nix b/hosts/myself/default.nix
index f7b5ea6..a0920c7 100644
--- a/hosts/myself/default.nix
+++ b/hosts/myself/default.nix
@@ -1,131 +1,131 @@
 { config, pkgs, lib, ... }:
 
 {
-  imports = [  
-    ./hardware-configuration.nix
-  ];
+	imports = [	
+		./hardware-configuration.nix
+	];
 
-  environment.systemPackages = with pkgs; [
-    git
-    (python3.withPackages (p: with p; [ pip virtualenv ]))
-    tmux
-    tree
-    vim
-    xonsh
-  ];
-  services = {
-    openssh.enable = true;
-  };
-  systemd.services = let
-    def = id: {
-      enable = true;
-      ephemeral = false;
-      extraEnvironment = {
-      	HTTP_PORT_MIN = builtins.toString (8000 + id);
-      	HTTP_PORT_MAX = builtins.toString (8000 + id);
-      };
-      extraLabels = [ "nixos" "isaiah" ];
-      extraPackages = with pkgs; [
-        config.virtualisation.virtualbox.host.package
-        curl
-        gawk
-        packer
-        pup
-        (python3.withPackages (p: with p; [ pip virtualenv ]))
-        qemu_full
-        qemu_kvm
-        xonsh
-        xorriso
-      ];
-      name = "isaiah-nix-${builtins.toString id}";
-      nodeRuntimes = [ "node20" ];
-      package = pkgs.github-runner;
-      replace = true;
-      runnerGroup = null;
-      serviceOverrides = {
-        Group = "vboxusers";
-      };
-      tokenFile = "/etc/github_token";
-      user = "runner";
-      url = "https://github.com/greg-hellings/vms";
-      workDir = "/home/runner/${builtins.toString id}";
-    };
-    runner = (import ./runner.nix);
-  in {
-    gh-one = (runner { inherit config lib pkgs; svcName = "gh-one"; cfg = def 1; });
-    gh-two = (runner { inherit config lib pkgs; svcName = "gh-two"; cfg = def 2; });
-    gh-three = (runner { inherit config lib pkgs; svcName = "gh-three"; cfg = def 3; });
-    gh-four = (runner { inherit config lib pkgs; svcName = "gh-four"; cfg = def 4; });
-    gh-five = (runner { inherit config lib pkgs; svcName = "gh-five"; cfg = def 5; });
-  };
-  networking = {
-    hostName = "myself";
-    useDHCP = false;
-    defaultGateway = {
-      address = " 10.42.1.1";
-      interface = "enp38s0";
-    };
-    interfaces.enp38s0 = {
-      ipv4.addresses = [ {
-        address = "10.42.1.6";
-        prefixLength = 16;
-      } ];
-    };
-    nameservers = [
-      "10.42.1.5"
-    ];
-  };
-  virtualisation = {
-    libvirtd = {
-      enable = false;
-      onBoot = "ignore";
-    };
-    virtualbox.host = {
-      enable = true;
-      enableExtensionPack = true;
-    };
-  };
-  users = {
-    users = {
-      runner = {
-        extraGroups = [
-          "kvm"
-          "vboxusers"
-        ];
-        group = "runner";
-        isNormalUser = true;
-      };
-      greg = {
-        extraGroups = [
-          "kvm"
-          "sudo"
-          "vboxusers"
-          "wheel"
-        ];
-        isNormalUser = true;
-      };
-    };
-    groups.runner = {};
-  };
-  system.stateVersion = lib.mkForce "24.05";
-  boot = {
-    extraModprobeConfig = "options kvm_amd nested=1 vboxdrv";
-    supportedFilesystems = [ "ntfs" ];
-    loader = {
-      efi = {
-        canTouchEfiVariables = true;
-        efiSysMountPoint = "/boot";
-      };
-      systemd-boot = {
-        enable = true;
-        configurationLimit = 10;
-      };
-    };
-  };
-  nixpkgs.config = {
-    allowUnfree = true;
-    permittedInsecurePackages = [
-      "nodejs-16.20.2"
-    ];
-  };
+	environment.systemPackages = with pkgs; [
+		git
+		(python3.withPackages (p: with p; [ pip virtualenv ]))
+		tmux
+		tree
+		vim
+		xonsh
+	];
+	services = {
+		openssh.enable = true;
+	};
+	systemd.services = let
+		def = id: {
+			enable = true;
+			ephemeral = false;
+			extraEnvironment = {
+				HTTP_PORT_MIN = builtins.toString (8000 + id);
+				HTTP_PORT_MAX = builtins.toString (8000 + id);
+			};
+			extraLabels = [ "nixos" "isaiah" ];
+			extraPackages = with pkgs; [
+				config.virtualisation.virtualbox.host.package
+				curl
+				gawk
+				packer
+				pup
+				(python3.withPackages (p: with p; [ pip virtualenv ]))
+				qemu_full
+				qemu_kvm
+				xonsh
+				xorriso
+			];
+			name = "isaiah-nix-${builtins.toString id}";
+			nodeRuntimes = [ "node20" ];
+			package = pkgs.github-runner;
+			replace = true;
+			runnerGroup = null;
+			serviceOverrides = {
+				Group = "vboxusers";
+			};
+			tokenFile = "/etc/github_token";
+			user = "runner";
+			url = "https://github.com/greg-hellings/vms";
+			workDir = "/home/runner/${builtins.toString id}";
+		};
+		runner = (import ./runner.nix);
+	in {
+		gh-one = (runner { inherit config lib pkgs; svcName = "gh-one"; cfg = def 1; });
+		gh-two = (runner { inherit config lib pkgs; svcName = "gh-two"; cfg = def 2; });
+		gh-three = (runner { inherit config lib pkgs; svcName = "gh-three"; cfg = def 3; });
+		gh-four = (runner { inherit config lib pkgs; svcName = "gh-four"; cfg = def 4; });
+		gh-five = (runner { inherit config lib pkgs; svcName = "gh-five"; cfg = def 5; });
+	};
+	networking = {
+		hostName = "myself";
+		useDHCP = false;
+		defaultGateway = {
+			address = " 10.42.1.1";
+			interface = "enp38s0";
+		};
+		interfaces.enp38s0 = {
+			ipv4.addresses = [ {
+				address = "10.42.1.6";
+				prefixLength = 16;
+			} ];
+		};
+		nameservers = [
+			"10.42.1.5"
+		];
+	};
+	virtualisation = {
+		libvirtd = {
+			enable = false;
+			onBoot = "ignore";
+		};
+		virtualbox.host = {
+			enable = true;
+			enableExtensionPack = true;
+		};
+	};
+	users = {
+		users = {
+			runner = {
+				extraGroups = [
+					"kvm"
+					"vboxusers"
+				];
+				group = "runner";
+				isNormalUser = true;
+			};
+			greg = {
+				extraGroups = [
+					"kvm"
+					"sudo"
+					"vboxusers"
+					"wheel"
+				];
+				isNormalUser = true;
+			};
+		};
+		groups.runner = {};
+	};
+	system.stateVersion = lib.mkForce "24.05";
+	boot = {
+		extraModprobeConfig = "options kvm_amd nested=1 vboxdrv";
+		supportedFilesystems = [ "ntfs" ];
+		loader = {
+			efi = {
+				canTouchEfiVariables = true;
+				efiSysMountPoint = "/boot";
+			};
+			systemd-boot = {
+				enable = true;
+				configurationLimit = 10;
+			};
+		};
+	};
+	nixpkgs.config = {
+		allowUnfree = true;
+		permittedInsecurePackages = [
+			"nodejs-16.20.2"
+		];
+	};
 }
diff --git a/hosts/myself/hardware-configuration.nix b/hosts/myself/hardware-configuration.nix
index 7a0d889..7d20b31 100644
--- a/hosts/myself/hardware-configuration.nix
+++ b/hosts/myself/hardware-configuration.nix
@@ -1,51 +1,51 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
+# Do not modify this file!	It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.	Please make changes
 # to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+	imports =
+		[ (modulesPath + "/installer/scan/not-detected.nix")
+		];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
+	boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
+	boot.initrd.kernelModules = [ ];
+	boot.kernelModules = [ "kvm-amd" ];
+	boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/714744ca-dd9d-4713-b571-c6ccfbf56d79";
-      fsType = "btrfs";
-      options = [ "subvol=nixos" ];
-    };
+	fileSystems."/" =
+		{ device = "/dev/disk/by-uuid/714744ca-dd9d-4713-b571-c6ccfbf56d79";
+			fsType = "btrfs";
+			options = [ "subvol=nixos" ];
+		};
 
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/714744ca-dd9d-4713-b571-c6ccfbf56d79";
-      fsType = "btrfs";
-      options = [ "subvol=home" ];
-    };
+	fileSystems."/home" =
+		{ device = "/dev/disk/by-uuid/714744ca-dd9d-4713-b571-c6ccfbf56d79";
+			fsType = "btrfs";
+			options = [ "subvol=home" ];
+		};
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/29E7-E20C";
-      fsType = "vfat";
-    };
+	fileSystems."/boot" =
+		{ device = "/dev/disk/by-uuid/29E7-E20C";
+			fsType = "vfat";
+		};
 
-  fileSystems."/myvol" = 
-    { device = "/dev/nvme0n1p1";
-      fsType = "btrfs";
-    };
+	fileSystems."/myvol" = 
+		{ device = "/dev/nvme0n1p1";
+			fsType = "btrfs";
+		};
 
-  swapDevices = [ ];
+	swapDevices = [ ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp38s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp39s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp42s0f3u5u3c2.useDHCP = lib.mkDefault true;
+	# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+	# (the default) this is the recommended approach. When using systemd-networkd it's
+	# still possible to use this option, but it's recommended to use it in conjunction
+	# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+	networking.useDHCP = lib.mkDefault true;
+	# networking.interfaces.enp38s0.useDHCP = lib.mkDefault true;
+	# networking.interfaces.enp39s0.useDHCP = lib.mkDefault true;
+	# networking.interfaces.enp42s0f3u5u3c2.useDHCP = lib.mkDefault true;
 
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+	nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+	hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/hosts/myself/runner.nix b/hosts/myself/runner.nix
index 8578100..fd9b129 100644
--- a/hosts/myself/runner.nix
+++ b/hosts/myself/runner.nix
@@ -6,13 +6,13 @@
 , svcName
 
 , systemdDir ? "${svcName}/${cfg.name}"
-  # %t: Runtime directory root (usually /run); see systemd.unit(5)
+	# %t: Runtime directory root (usually /run); see systemd.unit(5)
 , runtimeDir ? "%t/${systemdDir}"
-  # %S: State directory root (usually /var/lib); see systemd.unit(5)
+	# %S: State directory root (usually /var/lib); see systemd.unit(5)
 , stateDir ? "%S/${systemdDir}"
-  # %L: Log directory root (usually /var/log); see systemd.unit(5)
+	# %L: Log directory root (usually /var/log); see systemd.unit(5)
 , logsDir ? "%L/${systemdDir}"
-  # Name of file stored in service state directory
+	# Name of file stored in service state directory
 , currentConfigTokenFilename ? ".current-token"
 
 , ...
@@ -21,187 +21,187 @@
 with lib;
 
 let
-  workDir = if cfg.workDir == null then runtimeDir else cfg.workDir;
-  package = cfg.package.override { inherit (cfg) nodeRuntimes; };
+	workDir = if cfg.workDir == null then runtimeDir else cfg.workDir;
+	package = cfg.package.override { inherit (cfg) nodeRuntimes; };
 in
 {
-  description = "GitHub Actions runner";
+	description = "GitHub Actions runner";
 
-  wantedBy = [ "multi-user.target" ];
-  wants = [ "network-online.target" ];
-  after = [ "network.target" "network-online.target" ];
+	wantedBy = [ "multi-user.target" ];
+	wants = [ "network-online.target" ];
+	after = [ "network.target" "network-online.target" ];
 
-  environment = {
-    HOME = workDir;
-    RUNNER_ROOT = stateDir;
-  } // cfg.extraEnvironment;
+	environment = {
+		HOME = workDir;
+		RUNNER_ROOT = stateDir;
+	} // cfg.extraEnvironment;
 
-  path = (with pkgs; [
-    bash
-    coreutils
-    git
-    gnutar
-    gzip
-  ]) ++ [
-    config.nix.package
-  ] ++ cfg.extraPackages;
+	path = (with pkgs; [
+		bash
+		coreutils
+		git
+		gnutar
+		gzip
+	]) ++ [
+		config.nix.package
+	] ++ cfg.extraPackages;
 
-  serviceConfig = mkMerge [
-    {
-      ExecStart = "${package}/bin/Runner.Listener run --startuptype service";
+	serviceConfig = mkMerge [
+		{
+			ExecStart = "${package}/bin/Runner.Listener run --startuptype service";
 
-      # Does the following, sequentially:
-      # - If the module configuration or the token has changed, purge the state directory,
-      #   and create the current and the new token file with the contents of the configured
-      #   token. While both files have the same content, only the later is accessible by
-      #   the service user.
-      # - Configure the runner using the new token file. When finished, delete it.
-      # - Set up the directory structure by creating the necessary symlinks.
-      ExecStartPre =
-        let
-          # Wrapper script which expects the full path of the state, working and logs
-          # directory as arguments. Overrides the respective systemd variables to provide
-          # unambiguous directory names. This becomes relevant, for example, if the
-          # caller overrides any of the StateDirectory=, RuntimeDirectory= or LogDirectory=
-          # to contain more than one directory. This causes systemd to set the respective
-          # environment variables with the path of all of the given directories, separated
-          # by a colon.
-          writeScript = name: lines: pkgs.writeShellScript "${svcName}-${name}.sh" ''
-            set -euo pipefail
+			# Does the following, sequentially:
+			# - If the module configuration or the token has changed, purge the state directory,
+			#	 and create the current and the new token file with the contents of the configured
+			#	 token. While both files have the same content, only the later is accessible by
+			#	 the service user.
+			# - Configure the runner using the new token file. When finished, delete it.
+			# - Set up the directory structure by creating the necessary symlinks.
+			ExecStartPre =
+				let
+					# Wrapper script which expects the full path of the state, working and logs
+					# directory as arguments. Overrides the respective systemd variables to provide
+					# unambiguous directory names. This becomes relevant, for example, if the
+					# caller overrides any of the StateDirectory=, RuntimeDirectory= or LogDirectory=
+					# to contain more than one directory. This causes systemd to set the respective
+					# environment variables with the path of all of the given directories, separated
+					# by a colon.
+					writeScript = name: lines: pkgs.writeShellScript "${svcName}-${name}.sh" ''
+						set -euo pipefail
 
-            STATE_DIRECTORY="$1"
-            WORK_DIRECTORY="$2"
-            LOGS_DIRECTORY="$3"
+						STATE_DIRECTORY="$1"
+						WORK_DIRECTORY="$2"
+						LOGS_DIRECTORY="$3"
 
-            ${lines}
-          '';
-          runnerRegistrationConfig = getAttrs [ "name" "tokenFile" "url" "runnerGroup" "extraLabels" "ephemeral" "workDir" ] cfg;
-          newConfigPath = builtins.toFile "${svcName}-config.json" (builtins.toJSON runnerRegistrationConfig);
-          currentConfigPath = "$STATE_DIRECTORY/.nixos-current-config.json";
-          newConfigTokenPath = "$STATE_DIRECTORY/.new-token";
-          currentConfigTokenPath = "$STATE_DIRECTORY/${currentConfigTokenFilename}";
+						${lines}
+					'';
+					runnerRegistrationConfig = getAttrs [ "name" "tokenFile" "url" "runnerGroup" "extraLabels" "ephemeral" "workDir" ] cfg;
+					newConfigPath = builtins.toFile "${svcName}-config.json" (builtins.toJSON runnerRegistrationConfig);
+					currentConfigPath = "$STATE_DIRECTORY/.nixos-current-config.json";
+					newConfigTokenPath = "$STATE_DIRECTORY/.new-token";
+					currentConfigTokenPath = "$STATE_DIRECTORY/${currentConfigTokenFilename}";
 
-          runnerCredFiles = [
-            ".credentials"
-            ".credentials_rsaparams"
-            ".runner"
-          ];
-          unconfigureRunner = writeScript "unconfigure" ''
-            copy_tokens() {
-              # Copy the configured token file to the state dir and allow the service user to read the file
-              install --mode=666 ${escapeShellArg cfg.tokenFile} "${newConfigTokenPath}"
-              # Also copy current file to allow for a diff on the next start
-              install --mode=600 ${escapeShellArg cfg.tokenFile} "${currentConfigTokenPath}"
-            }
-            clean_state() {
-              find "$STATE_DIRECTORY/" -mindepth 1 -delete
-              copy_tokens
-            }
-            diff_config() {
-              changed=0
-              # Check for module config changes
-              [[ -f "${currentConfigPath}" ]] \
-                && ${pkgs.diffutils}/bin/diff -q '${newConfigPath}' "${currentConfigPath}" >/dev/null 2>&1 \
-                || changed=1
-              # Also check the content of the token file
-              [[ -f "${currentConfigTokenPath}" ]] \
-                && ${pkgs.diffutils}/bin/diff -q "${currentConfigTokenPath}" ${escapeShellArg cfg.tokenFile} >/dev/null 2>&1 \
-                || changed=1
-              # If the config has changed, remove old state and copy tokens
-              if [[ "$changed" -eq 1 ]]; then
-                echo "Config has changed, removing old runner state."
-                echo "The old runner will still appear in the GitHub Actions UI." \
-                     "You have to remove it manually."
-                clean_state
-              fi
-            }
-            if [[ "${optionalString cfg.ephemeral "1"}" ]]; then
-              # In ephemeral mode, we always want to start with a clean state
-              clean_state
-            elif [[ "$(ls -A "$STATE_DIRECTORY")" ]]; then
-              # There are state files from a previous run; diff them to decide if we need a new registration
-              diff_config
-            else
-              # The state directory is entirely empty which indicates a first start
-              copy_tokens
-            fi
-            # Always clean workDir
-            find -H "$WORK_DIRECTORY" -mindepth 1 -delete
-          '';
-          configureRunner = writeScript "configure" ''
-            if [[ -e "${newConfigTokenPath}" ]]; then
-              echo "Configuring GitHub Actions Runner"
-              args=(
-                --unattended
-                --disableupdate
-                --work "$WORK_DIRECTORY"
-                --url ${escapeShellArg cfg.url}
-                --labels ${escapeShellArg (concatStringsSep "," cfg.extraLabels)}
-                --name ${escapeShellArg cfg.name}
-                ${optionalString cfg.replace "--replace"}
-                ${optionalString (cfg.runnerGroup != null) "--runnergroup ${escapeShellArg cfg.runnerGroup}"}
-                ${optionalString cfg.ephemeral "--ephemeral"}
-              )
-              # If the token file contains a PAT (i.e., it starts with "ghp_" or "github_pat_"), we have to use the --pat option,
-              # if it is not a PAT, we assume it contains a registration token and use the --token option
-              token=$(<"${newConfigTokenPath}")
-              if [[ "$token" =~ ^ghp_* ]] || [[ "$token" =~ ^github_pat_* ]]; then
-                args+=(--pat "$token")
-              else
-                args+=(--token "$token")
-              fi
-              ${package}/bin/Runner.Listener configure "''${args[@]}"
-              # Move the automatically created _diag dir to the logs dir
-              mkdir -p  "$STATE_DIRECTORY/_diag"
-              cp    -r  "$STATE_DIRECTORY/_diag/." "$LOGS_DIRECTORY/"
-              rm    -rf "$STATE_DIRECTORY/_diag/"
-              # Cleanup token from config
-              rm "${newConfigTokenPath}"
-              # Symlink to new config
-              ln -s '${newConfigPath}' "${currentConfigPath}"
-            fi
-          '';
-          setupWorkDir = writeScript "setup-work-dirs" ''
-            # Link _diag dir
-            ln -s "$LOGS_DIRECTORY" "$WORK_DIRECTORY/_diag"
+					runnerCredFiles = [
+						".credentials"
+						".credentials_rsaparams"
+						".runner"
+					];
+					unconfigureRunner = writeScript "unconfigure" ''
+						copy_tokens() {
+							# Copy the configured token file to the state dir and allow the service user to read the file
+							install --mode=666 ${escapeShellArg cfg.tokenFile} "${newConfigTokenPath}"
+							# Also copy current file to allow for a diff on the next start
+							install --mode=600 ${escapeShellArg cfg.tokenFile} "${currentConfigTokenPath}"
+						}
+						clean_state() {
+							find "$STATE_DIRECTORY/" -mindepth 1 -delete
+							copy_tokens
+						}
+						diff_config() {
+							changed=0
+							# Check for module config changes
+							[[ -f "${currentConfigPath}" ]] \
+								&& ${pkgs.diffutils}/bin/diff -q '${newConfigPath}' "${currentConfigPath}" >/dev/null 2>&1 \
+								|| changed=1
+							# Also check the content of the token file
+							[[ -f "${currentConfigTokenPath}" ]] \
+								&& ${pkgs.diffutils}/bin/diff -q "${currentConfigTokenPath}" ${escapeShellArg cfg.tokenFile} >/dev/null 2>&1 \
+								|| changed=1
+							# If the config has changed, remove old state and copy tokens
+							if [[ "$changed" -eq 1 ]]; then
+								echo "Config has changed, removing old runner state."
+								echo "The old runner will still appear in the GitHub Actions UI." \
+										 "You have to remove it manually."
+								clean_state
+							fi
+						}
+						if [[ "${optionalString cfg.ephemeral "1"}" ]]; then
+							# In ephemeral mode, we always want to start with a clean state
+							clean_state
+						elif [[ "$(ls -A "$STATE_DIRECTORY")" ]]; then
+							# There are state files from a previous run; diff them to decide if we need a new registration
+							diff_config
+						else
+							# The state directory is entirely empty which indicates a first start
+							copy_tokens
+						fi
+						# Always clean workDir
+						find -H "$WORK_DIRECTORY" -mindepth 1 -delete
+					'';
+					configureRunner = writeScript "configure" ''
+						if [[ -e "${newConfigTokenPath}" ]]; then
+							echo "Configuring GitHub Actions Runner"
+							args=(
+								--unattended
+								--disableupdate
+								--work "$WORK_DIRECTORY"
+								--url ${escapeShellArg cfg.url}
+								--labels ${escapeShellArg (concatStringsSep "," cfg.extraLabels)}
+								--name ${escapeShellArg cfg.name}
+								${optionalString cfg.replace "--replace"}
+								${optionalString (cfg.runnerGroup != null) "--runnergroup ${escapeShellArg cfg.runnerGroup}"}
+								${optionalString cfg.ephemeral "--ephemeral"}
+							)
+							# If the token file contains a PAT (i.e., it starts with "ghp_" or "github_pat_"), we have to use the --pat option,
+							# if it is not a PAT, we assume it contains a registration token and use the --token option
+							token=$(<"${newConfigTokenPath}")
+							if [[ "$token" =~ ^ghp_* ]] || [[ "$token" =~ ^github_pat_* ]]; then
+								args+=(--pat "$token")
+							else
+								args+=(--token "$token")
+							fi
+							${package}/bin/Runner.Listener configure "''${args[@]}"
+							# Move the automatically created _diag dir to the logs dir
+							mkdir -p	"$STATE_DIRECTORY/_diag"
+							cp		-r	"$STATE_DIRECTORY/_diag/." "$LOGS_DIRECTORY/"
+							rm		-rf "$STATE_DIRECTORY/_diag/"
+							# Cleanup token from config
+							rm "${newConfigTokenPath}"
+							# Symlink to new config
+							ln -s '${newConfigPath}' "${currentConfigPath}"
+						fi
+					'';
+					setupWorkDir = writeScript "setup-work-dirs" ''
+						# Link _diag dir
+						ln -s "$LOGS_DIRECTORY" "$WORK_DIRECTORY/_diag"
 
-            # Link the runner credentials to the work dir
-            ln -s "$STATE_DIRECTORY"/{${lib.concatStringsSep "," runnerCredFiles}} "$WORK_DIRECTORY/"
-          '';
-        in
-        map (x: "${x} ${escapeShellArgs [ stateDir workDir logsDir ]}") [
-          "+${unconfigureRunner}" # runs as root
-          configureRunner
-          setupWorkDir
-        ];
+						# Link the runner credentials to the work dir
+						ln -s "$STATE_DIRECTORY"/{${lib.concatStringsSep "," runnerCredFiles}} "$WORK_DIRECTORY/"
+					'';
+				in
+				map (x: "${x} ${escapeShellArgs [ stateDir workDir logsDir ]}") [
+					"+${unconfigureRunner}" # runs as root
+					configureRunner
+					setupWorkDir
+				];
 
-      # If running in ephemeral mode, restart the service on-exit (i.e., successful de-registration of the runner)
-      # to trigger a fresh registration.
-      Restart = if cfg.ephemeral then "on-success" else "no";
-      # If the runner exits with `ReturnCode.RetryableError = 2`, always restart the service:
-      # https://github.com/actions/runner/blob/40ed7f8/src/Runner.Common/Constants.cs#L146
-      RestartForceExitStatus = [ 2 ];
+			# If running in ephemeral mode, restart the service on-exit (i.e., successful de-registration of the runner)
+			# to trigger a fresh registration.
+			Restart = if cfg.ephemeral then "on-success" else "no";
+			# If the runner exits with `ReturnCode.RetryableError = 2`, always restart the service:
+			# https://github.com/actions/runner/blob/40ed7f8/src/Runner.Common/Constants.cs#L146
+			RestartForceExitStatus = [ 2 ];
 
-      # Contains _diag
-      LogsDirectory = [ systemdDir ];
-      # Default RUNNER_ROOT which contains ephemeral Runner data
-      RuntimeDirectory = [ systemdDir ];
-      # Home of persistent runner data, e.g., credentials
-      StateDirectory = [ systemdDir ];
-      StateDirectoryMode = "0700";
-      WorkingDirectory = workDir;
+			# Contains _diag
+			LogsDirectory = [ systemdDir ];
+			# Default RUNNER_ROOT which contains ephemeral Runner data
+			RuntimeDirectory = [ systemdDir ];
+			# Home of persistent runner data, e.g., credentials
+			StateDirectory = [ systemdDir ];
+			StateDirectoryMode = "0700";
+			WorkingDirectory = workDir;
 
-      InaccessiblePaths = [
-        # Token file path given in the configuration, if visible to the service
-        "-${cfg.tokenFile}"
-        # Token file in the state directory
-        "${stateDir}/${currentConfigTokenFilename}"
-      ];
+			InaccessiblePaths = [
+				# Token file path given in the configuration, if visible to the service
+				"-${cfg.tokenFile}"
+				# Token file in the state directory
+				"${stateDir}/${currentConfigTokenFilename}"
+			];
 
-      KillSignal = "SIGINT";
-    }
-    (mkIf (cfg.user != null) { User = cfg.user; })
-    cfg.serviceOverrides
-  ];
+			KillSignal = "SIGINT";
+		}
+		(mkIf (cfg.user != null) { User = cfg.user; })
+		cfg.serviceOverrides
+	];
 }