From 71df351217ba46d5a09d9032371d8e31778d053a Mon Sep 17 00:00:00 2001
From: DavHau <d.hauer.it@gmail.com>
Date: Mon, 29 Jul 2024 18:17:43 +0700
Subject: [PATCH] vars: fix bug when computing taarget path for sops

---
 nixosModules/clanCore/vars/secret/sops/default.nix | 7 +++----
 nixosModules/clanCore/vars/secret/sops/funcs.nix   | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixosModules/clanCore/vars/secret/sops/default.nix b/nixosModules/clanCore/vars/secret/sops/default.nix
index 9a6234535..b1614f06e 100644
--- a/nixosModules/clanCore/vars/secret/sops/default.nix
+++ b/nixosModules/clanCore/vars/secret/sops/default.nix
@@ -20,7 +20,7 @@ in
     # Before we generate a secret we cannot know the path yet, so we need to set it to an empty string
     fileModule = file: {
       path = lib.mkIf file.config.secret (
-        config.sops.secrets.${"vars-${config.clan.core.machineName}-${file.config.generatorName}-${file.config.name}"}.path
+        config.sops.secrets.${"${config.clan.core.machineName}/${file.config.generatorName}/${file.config.name}"}.path
           or "/no-such-path"
       );
     };
@@ -31,10 +31,9 @@ in
   config.sops = lib.mkIf (config.clan.core.vars.settings.secretStore == "sops") {
     secrets = lib.listToAttrs (
       flip map vars (secret: {
-        name = secret.name;
+        name = secret.id;
         value = {
-          sopsFile =
-            config.clan.core.clanDir + "/sops/vars/${secret.machine}/${secret.generator}/${secret.name}/secret";
+          sopsFile = config.clan.core.clanDir + "/sops/vars/${secret.id}/secret";
           format = "binary";
         };
       })
diff --git a/nixosModules/clanCore/vars/secret/sops/funcs.nix b/nixosModules/clanCore/vars/secret/sops/funcs.nix
index 980e05773..b5700794f 100644
--- a/nixosModules/clanCore/vars/secret/sops/funcs.nix
+++ b/nixosModules/clanCore/vars/secret/sops/funcs.nix
@@ -22,6 +22,7 @@ rec {
           machine = machine_name;
           generator = generator_name;
           name = secret_name;
+          id = "${machine_name}/${generator_name}/${secret_name}";
         })
       )
     );