From 23c979f8db79d1580b561faed209b31fe28ffc8c Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Wed, 13 Sep 2023 23:18:05 +0200
Subject: [PATCH] secrets deploy/generate: use nix_build_machine

---
 pkgs/clan-cli/clan_cli/secrets/deploy.py   | 30 ++++++++++------------
 pkgs/clan-cli/clan_cli/secrets/generate.py | 25 ++++++++----------
 2 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/pkgs/clan-cli/clan_cli/secrets/deploy.py b/pkgs/clan-cli/clan_cli/secrets/deploy.py
index 16c1a1c..50fc984 100644
--- a/pkgs/clan-cli/clan_cli/secrets/deploy.py
+++ b/pkgs/clan-cli/clan_cli/secrets/deploy.py
@@ -4,25 +4,20 @@ import sys
 
 from clan_cli.errors import ClanError
 
-from ..dirs import get_clan_flake_toplevel
+from ..nix import nix_build_machine
 
 
 def deploy_secrets(machine: str) -> None:
-    clan_flake = get_clan_flake_toplevel()
     proc = subprocess.run(
-        [
-            "nix",
-            "build",
-            "--impure",
-            "--print-out-paths",
-            "--expr",
-            f'let f = builtins.getFlake "{clan_flake}"; in '
-            "(f.nixosConfigurations."
-            f"{machine}"
-            ".extendModules { modules = [{ clanCore.clanDir = "
-            f"{clan_flake}"
-            "; }]; }).config.system.clan.deploySecrets",
-        ],
+        nix_build_machine(
+            machine=machine,
+            attr=[
+                "config",
+                "system",
+                "clan",
+                "deploySecrets",
+            ],
+        ),
         capture_output=True,
         text=True,
     )
@@ -32,7 +27,10 @@ def deploy_secrets(machine: str) -> None:
 
     secret_deploy_script = proc.stdout.strip()
     secret_deploy = subprocess.run(
-        [secret_deploy_script],
+        [
+            secret_deploy_script,
+            f"root@{machine}",
+        ],
     )
 
     if secret_deploy.returncode != 0:
diff --git a/pkgs/clan-cli/clan_cli/secrets/generate.py b/pkgs/clan-cli/clan_cli/secrets/generate.py
index 2c0fb9a..3093eee 100644
--- a/pkgs/clan-cli/clan_cli/secrets/generate.py
+++ b/pkgs/clan-cli/clan_cli/secrets/generate.py
@@ -4,25 +4,20 @@ import sys
 
 from clan_cli.errors import ClanError
 
-from ..dirs import get_clan_flake_toplevel
+from ..nix import nix_build_machine
 
 
 def generate_secrets(machine: str) -> None:
-    clan_flake = get_clan_flake_toplevel()
     proc = subprocess.run(
-        [
-            "nix",
-            "build",
-            "--impure",
-            "--print-out-paths",
-            "--expr",
-            f'let f = builtins.getFlake "{clan_flake}"; in '
-            "(f.nixosConfigurations."
-            f"{machine}"
-            ".extendModules { modules = [{ clanCore.clanDir = "
-            f"{clan_flake}"
-            "; }]; }).config.system.clan.generateSecrets",
-        ],
+        nix_build_machine(
+            machine=machine,
+            attr=[
+                "config",
+                "system",
+                "clan",
+                "generateSecrets",
+            ],
+        ),
         capture_output=True,
         text=True,
     )