From ae5e197da792886a55f6208957aff895fad11ec0 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Fri, 28 Jul 2023 18:12:48 +0200
Subject: [PATCH 1/3] installer: fix qrcode generation error

---
 modules/hidden-ssh-announce.nix | 2 +-
 modules/installer.nix           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/hidden-ssh-announce.nix b/modules/hidden-ssh-announce.nix
index 7fb6c5b..698d436 100644
--- a/modules/hidden-ssh-announce.nix
+++ b/modules/hidden-ssh-announce.nix
@@ -31,7 +31,7 @@
       client.enable = true;
     };
     systemd.services.hidden-ssh-announce = {
-      description = "irc announce hidden ssh";
+      description = "announce hidden ssh";
       after = [ "tor.service" "network-online.target" ];
       wants = [ "tor.service" ];
       wantedBy = [ "multi-user.target" ];
diff --git a/modules/installer.nix b/modules/installer.nix
index e691c8e..cc94f27 100644
--- a/modules/installer.nix
+++ b/modules/installer.nix
@@ -28,9 +28,9 @@
           password: $password, address: $address
         }' > /var/shared/login.info
       cat /var/shared/login.info |
-        ${pkgs.qrencode}/bin/qrencode -t utf8 > /var/shared/qrcode.utf8
+        ${pkgs.qrencode}/bin/qrencode -t utf8 -o /var/shared/qrcode.utf8
       cat /var/shared/login.info |
-        ${pkgs.qrencode}/bin/qrencode -t png > /var/shared/qrcode.png
+        ${pkgs.qrencode}/bin/qrencode -t png -o /var/shared/qrcode.png
     '';
   };
   services.getty.autologinUser = lib.mkForce "root";

From 95396f5237c54760934a14f6ed8fcd4be9ebff0a Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Fri, 28 Jul 2023 18:17:10 +0200
Subject: [PATCH 2/3] installer: error out on qrcode creation

---
 modules/installer.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/installer.nix b/modules/installer.nix
index cc94f27..05eebe1 100644
--- a/modules/installer.nix
+++ b/modules/installer.nix
@@ -20,6 +20,7 @@
   hidden-ssh-announce = {
     enable = true;
     script = pkgs.writers.writeDash "write-hostname" ''
+      set -efu
       mkdir -p /var/shared
       echo "$1" > /var/shared/onion-hostname
       ${pkgs.jq}/bin/jq -nc \

From a0658491969566289d0f739845027316047d7452 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Fri, 28 Jul 2023 18:17:21 +0200
Subject: [PATCH 3/3] installer: better feedback on first boot

---
 modules/installer.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/installer.nix b/modules/installer.nix
index 05eebe1..2a3040d 100644
--- a/modules/installer.nix
+++ b/modules/installer.nix
@@ -37,7 +37,8 @@
   services.getty.autologinUser = lib.mkForce "root";
   programs.bash.interactiveShellInit = ''
     if [ "$(tty)" = "/dev/tty1" ]; then
-      until test -e /var/shared/qrcode.utf8; do sleep 1; done
+      echo 'waiting for tor to generate the hidden service'
+      until test -e /var/shared/qrcode.utf8; do echo .; sleep 1; done
       cat /var/shared/qrcode.utf8
     fi
   '';