From 4cfd58044779d77301f622ad5c34ba296cb53ad1 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sat, 2 Mar 2024 10:24:49 +0100
Subject: [PATCH] outputs: pass secretsData directly

---
 nixosModules/clanCore/outputs.nix          | 14 +-------------
 pkgs/clan-cli/clan_cli/secrets/generate.py |  2 +-
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/nixosModules/clanCore/outputs.nix b/nixosModules/clanCore/outputs.nix
index c7a77f1f..75d2c063 100644
--- a/nixosModules/clanCore/outputs.nix
+++ b/nixosModules/clanCore/outputs.nix
@@ -62,19 +62,7 @@
           description = ''
             secret data as json for the generator
           '';
-          default = pkgs.writers.writeJSON "secrets.json" (lib.mapAttrs
-            (_name: secret: {
-              secrets = lib.mapAttrsToList
-                (name: secret: {
-                  inherit name;
-                } // lib.optionalAttrs (secret ? groups) {
-                  inherit (secret) groups;
-                })
-                secret.secrets;
-              facts = lib.mapAttrs (_: secret: secret.path) secret.facts;
-              generator = secret.generator.finalScript;
-            })
-            config.clanCore.secrets);
+          default = pkgs.writers.writeJSON "secrets.json" config.clanCore.secrets;
         };
         vm.create = lib.mkOption {
           type = lib.types.path;
diff --git a/pkgs/clan-cli/clan_cli/secrets/generate.py b/pkgs/clan-cli/clan_cli/secrets/generate.py
index b38b39a7..bb9733f3 100644
--- a/pkgs/clan-cli/clan_cli/secrets/generate.py
+++ b/pkgs/clan-cli/clan_cli/secrets/generate.py
@@ -58,7 +58,7 @@ def generate_service_secrets(
                 "--unshare-user",
                 "--uid", "1000",
                 "--",
-                "bash", "-c", machine.secrets_data[service]["generator"]
+                "bash", "-c", machine.secrets_data[service]["generator"]["finalScript"]
             ],
         )
         # fmt: on