From cfec69fec493e447b8651b96f1aa0309dfed50c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 3 Sep 2023 14:04:18 +0200
Subject: [PATCH] different fix for missing secrets

---
 lib/build-clan/default.nix             | 4 ++--
 nixosModules/clanCore/secrets/sops.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/build-clan/default.nix b/lib/build-clan/default.nix
index 265a1c5..405934a 100644
--- a/lib/build-clan/default.nix
+++ b/lib/build-clan/default.nix
@@ -6,12 +6,12 @@
 let
   machinesDirs =
     if builtins.pathExists "${directory}/machines"
-    then builtins.readDir "${directory}/machines"
+    then builtins.readDir directory + /machines
     else { };
 
   machineSettings = machineName:
     if builtins.pathExists "${directory}/machines/${machineName}/settings.json"
-    then builtins.fromJSON (builtins.readFile "${directory}/machines/${machineName}/settings.json")
+    then builtins.fromJSON (builtins.readFile directory + /machines/${machineName}/settings.json)
     else { };
 
   nixosConfigurations = lib.mapAttrs
diff --git a/nixosModules/clanCore/secrets/sops.nix b/nixosModules/clanCore/secrets/sops.nix
index 05973cc..58a6eef 100644
--- a/nixosModules/clanCore/secrets/sops.nix
+++ b/nixosModules/clanCore/secrets/sops.nix
@@ -59,7 +59,7 @@
       in
       builtins.mapAttrs
         (name: _: {
-          sopsFile = "${config.clanCore.clanDir}/sops/secrets/${name}/secret";
+          sopsFile = config.clanCore.clanDir + "/sops/secrets/${name}/secret";
           format = "binary";
         })
         secrets;