switch ssh wait with a script

.github/workflows/arrow.yml

@@ -7,6 +7,7 @@ env:
   CLOUDFLARE_R2_ENDPOINT: "${{ secrets.CLOUDFLARE_ACCOUNT_ID }}.r2.cloudflarestorage.com"
   AWS_ACCESS_KEY_ID: ${{ secrets.CLOUDFLARE_R2_ACCESS_KEY }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.CLOUDFLARE_R2_SECRET_KEY }}
+  AWS_DEFAULT_REGION: auto
   AWS_ENDPOINT_URL_S3: "https://${{ secrets.CLOUDFLARE_ACCOUNT_ID }}.r2.cloudflarestorage.com"
   TF_VAR_vultr_api_key: ${{ secrets.VULTR_API_KEY }}
 
@@ -106,13 +107,17 @@ jobs:
         if: inputs.action == 'create'
         id: host
         working-directory: ${{ env.TERRAFORM_DIRECTORY }}
-        run: terraform output host_ip
+        run: terraform output -raw host_ip
 
       - name: Wait on SSH
-        uses: iFaxity/wait-on-action@v1.1.0
-        with:
-          resource: tcp ${{ steps.host.outputs.stdout }}:22
-          interval: 5000
+        if: inputs.action == 'create'
+        run: |
+          for i in $(seq 1 15); do
+            if $(nc -z -w 3 ${{ steps.host.outputs.stdout }} 22); then
+              exit 0
+            fi
+            sleep 10
+          done
 
       - name: Write Identity Keys to Files
         if: inputs.action == 'create'
@@ -122,4 +127,6 @@ jobs:
 
       - name: Copy Identity File to Host
         if: inputs.action == 'create'
-        run: scp -i deploy_ed25519 arrow_ed25519 noah@${{ steps.host.outputs.stdout }}:~/.ssh/id_ed25519
+        run: |
+          ssh noah@${{ steps.host.outputs.stdout }} 'mkdir -pv .ssh'
+          scp -i deploy_ed25519 arrow_ed25519 noah@${{ steps.host.outputs.stdout }}:~/.ssh/id_ed25519

modules/nixos/hardware/keyboard.nix

@@ -1,6 +1,6 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, lib, ... }: {
 
-  config = {
+  config = lib.mkIf config.physical {
 
     services.xserver = {
 

modules/nixos/services/cloudflare.nix

@@ -60,7 +60,7 @@ in {
           dns = {
             provider = {
               name = "cloudflare";
-              api_token = "{env.CF_API_TOKEN}";
+              api_token = "{env.CLOUDFLARE_API_TOKEN}";
             };
             resolvers = [ "1.1.1.1" ];
           };

modules/nixos/services/identity.nix

@@ -6,12 +6,12 @@
     wantedBy = [ "multi-user.target" ];
     serviceConfig = { Type = "oneshot"; };
     script = ''
-      while true; do
+      for i in $(seq 1 10); do
           if [ -f ${config.identityFile} ]; then
               echo "Identity file found."
               exit 0
           fi
-          sleep 5
+          sleep 6
       done
     '';
   };

private/cloudflare-api.age

@@ -1,17 +1,17 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyBlNHNi
-VzUvTDdmdndvOUpyMUlvdG5vSGNmdG9yWklPQlFFNVY5RzdabTMwCnh4YXdmY1d4
-dXVzYUhnaXVNam1pb0cxNWowZUQ0WUprczExeDMzQ3dPWEEKLT4gc3NoLWVkMjU1
-MTkgWXlTVU1RIGJkN3FTSzFFR1ROVTl5UWhqRndnM25DRlVIRHEzUlhZcjNCSUxt
-dVlvMEUKVmVFWUlML3FPaW04enl6d1R2c1dJaXpNQVhKV0R5aHFDbUlleldRTnNB
-WQotPiBzc2gtZWQyNTUxOSBuanZYNUEgY0dGbTM2b01VdnlDMTVtck1mSmNybG41
-aUE0eHlNUytQcjJBQjhWREpXVQpndHFtb0h0N0pucGN4dnJjbER4c3hPVFBER3V1
-ZENwQkUzbmRFVnpjeGpvCi0+IHNzaC1lZDI1NTE5IENxSU9VQSBIOFdxWThKSnpy
-T0xQN3Q1djlsV3VwcEdPaDIyZ21uclQ1bWo3T1VXQVF3ClhkQkNqSG5nOTBVcUNF
-MFhZU1AwQzJCd05IZm5lVmp6cGU2VXlpTlFheEUKLT4gc3NoLWVkMjU1MTkgejFP
-Y1p3IGZUd2tnNkxlOEhFamwvbjVQYkphSzM5VEMxNlpZREs1cUd6Q0JtKzNIem8K
-Y0trL083WXI1RXdaS1luR0dDYml1R1YwbCtGeUlESkVrbHY3Mk5RdURlOAotLS0g
-cWE1eFZVb3BEcWhtMlUxd002WitOVFpWb1VXcTVnaVYrNXFzVmlKeC9jRQrVsDej
-le+ACsK5t6K1sHxwMh1hEqTFj9oYJ8mdtYec12m8D07xEzZDlRT1WN6YNul1gWGJ
-B8WcyGfzJTERNhft+/llqNr9YR4w5ePN5F8LBXpEUequ6Q==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyBkckt3
+c1NtVEo1bm1XREk2ZE9PL1FkOFd0LzQ1R0J4TXN4VGd2clVrZ25NCjZKenFTdHFK
+MWVZSXI0NXdVTkhJQXRFRFBRRnIxRHZaOHY1UWVDYW9vTm8KLT4gc3NoLWVkMjU1
+MTkgWXlTVU1RIHBmRERwcXdGanBVV0JOczg0Q0hOa1dVM09EeGMxWmJDMm9YU2Mx
+djhxQkUKS2U2aHVza2JNdzltRW5wcWhqaTVPUEZoZGNWN2szQXlVYjZ3eXpwc2ZE
+OAotPiBzc2gtZWQyNTUxOSBuanZYNUEgbWU0WXA4RjVZWFdPcXZ5M1UwT3lON1JD
+cGhlRXZ2NEhWMHdEMitLWERqRQpKRGgwMUhISWE1Uk1ka1dteGo0dlhZcmNjVjN6
+QmJBQWo0Mko4aE5jUm9rCi0+IHNzaC1lZDI1NTE5IENxSU9VQSBLaU9sSmRzMlFG
+NjBYYTBYeFErNXJwZGVtZ1kvVmVCOXBDZWVoNWhDZ2hrCnE2dkJJSk8rbDRvSHYy
+bEVTdXg0VTg1RzZUNi84K1ZvOVB2aUJzNHVPRkEKLT4gc3NoLWVkMjU1MTkgejFP
+Y1p3IEM0Mnlockc2SlA1bXJhdnpQNXFnQ2w5bzFSTWpIajJybTBIM3VuNTN5bFUK
+bXNIUVVhTzlRMUJTSEpJUURUMXZjRU5zczNjYnBUVVFmMDVEZllONjFjWQotLS0g
+NXdIUWduN2Q2eXFzNlFueFR6OWxITVBranpsNTdXaktiSFZ0TTBxRFNlNAr9JzVO
+Rhx5rG7CSGdYfeMcuzye4jyE2yiVKi5TVr/qp3vbDpyDQKZLlAUSF/K0rTY9K7Rm
+ocY+y/V9ffh3LO2m1Y6BkRqWRJ7v4wcsc3jNGjDHlSB7EqnOwMCXyQAg
 -----END AGE ENCRYPTED FILE-----