From 3b0701f275e9edc83e2305fec438d999075b4551 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 13 Sep 2023 20:33:51 +0200
Subject: [PATCH] deploy: use nix-flake-archive instead of rsync to upload

---
 pkgs/clan-cli/clan_cli/machines/update.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/clan-cli/clan_cli/machines/update.py b/pkgs/clan-cli/clan_cli/machines/update.py
index bed009f83..e6f7dcf80 100644
--- a/pkgs/clan-cli/clan_cli/machines/update.py
+++ b/pkgs/clan-cli/clan_cli/machines/update.py
@@ -1,5 +1,6 @@
 import argparse
 import json
+import os
 import subprocess
 
 from ..ssh import Host, HostGroup, HostKeyCheck
@@ -13,11 +14,13 @@ def deploy_nixos(hosts: HostGroup) -> None:
     def deploy(h: Host) -> None:
         target = f"{h.user or 'root'}@{h.host}"
         ssh_arg = f"-p {h.port}" if h.port else ""
+        env = os.environ.copy()
+        env["NIX_SSHOPTS"] = ssh_arg
         res = h.run_local(
             ["nix", "flake", "archive", "--to", f"ssh://{target}", "--json"],
             check=True,
             stdout=subprocess.PIPE,
-            extra_env=dict(NIX_SSHOPTS=ssh_arg),
+            extra_env=env
         )
         data = json.loads(res.stdout)
         path = data["path"]