diff --git a/lib/build-clan/default.nix b/lib/build-clan/default.nix index 265a1c584..405934a2c 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 05973cc4f..58a6eef6d 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;