From 57a93e64ea1b6121bd8dc24adba9a6ee6ade5147 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Mon, 26 Sep 2022 00:04:50 +0200
Subject: [PATCH 1/2] modules/microvm: use ssh-ng in copyToServer

---
 modules/microvm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/microvm.nix b/modules/microvm.nix
index 689b752c..7f865942 100644
--- a/modules/microvm.nix
+++ b/modules/microvm.nix
@@ -66,7 +66,7 @@ in
     copyToServer = writeScript "copy-to-${server}" ''
       #! ${runtimeShell} -e
 
-      nix copy --to ssh://root@${serverFQDN} $@
+      nix copy --to ssh-ng://root@${serverFQDN} $@
     '';
 
     runOnServer = writeScript "run-on-${server}" ''

From 7eb79ae6f2937b70d625254f2df11b2653baf00d Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Mon, 26 Sep 2022 01:06:19 +0200
Subject: [PATCH 2/2] flake.nix: fix gcroots in microvm-update-${name}

---
 flake.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index ccfd9480..26145bd6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -388,9 +388,9 @@
               echo '${selfRef}' > flake
 
               [ -e old ] && nix store diff-closures ./old ./current
-              ln -sfT `pwd`/current /nix/var/nix/gcroots/microvm/${name}
-              ln -sfT `pwd`/booted /nix/var/nix/gcroots/microvm/booted-${name}
-              ln -sfT `pwd`/old /nix/var/nix/gcroots/microvm/old-${name}
+              ln -sfT \$PWD/current /nix/var/nix/gcroots/microvm/${name}
+              ln -sfT \$PWD/booted /nix/var/nix/gcroots/microvm/booted-${name}
+              ln -sfT \$PWD/old /nix/var/nix/gcroots/microvm/old-${name}
 
               systemctl restart microvm@${name}.service
               END