From 0a3982d0ac37b87a77ff19832344c4d78e1bf4cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 3 Sep 2023 13:24:36 +0200
Subject: [PATCH] fix machines folder not beeing present yet

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

diff --git a/lib/build-clan/default.nix b/lib/build-clan/default.nix
index 6186783d2..265a1c584 100644
--- a/lib/build-clan/default.nix
+++ b/lib/build-clan/default.nix
@@ -5,13 +5,13 @@
 }:
 let
   machinesDirs =
-    if builtins.pathExists (directory + /machines)
-    then builtins.readDir (directory + /machines)
+    if builtins.pathExists "${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))
+    if builtins.pathExists "${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 011754f3f..05973cc4f 100644
--- a/nixosModules/clanCore/secrets/sops.nix
+++ b/nixosModules/clanCore/secrets/sops.nix
@@ -48,18 +48,18 @@
         secretsDir = config.clanCore.clanDir + "/sops/secrets";
         encryptedForThisMachine = name: type:
           let
-            symlink = secretsDir + "/${name}/machines/${config.clanCore.machineName}";
+            symlink = "${secretsDir}/${name}/machines/${config.clanCore.machineName}";
           in
           # WTF, nix bug, my symlink is in the nixos module detected as a directory also it works in the repl
-          type == "directory" && (builtins.readFileType symlink == "directory" || builtins.readFileType symlink == "symlink");
+          type == "directory" && builtins.pathExists symlink && (builtins.readFileType symlink == "directory" || builtins.readFileType symlink == "symlink");
         secrets =
-          if !builtins.pathExists secretsDir
+          if !(builtins.pathExists secretsDir)
           then { }
           else lib.filterAttrs encryptedForThisMachine (builtins.readDir secretsDir);
       in
       builtins.mapAttrs
         (name: _: {
-          sopsFile = config.clanCore.clanDir + "/sops/secrets/${name}/secret";
+          sopsFile = "${config.clanCore.clanDir}/sops/secrets/${name}/secret";
           format = "binary";
         })
         secrets;