diff --git a/clanModules/sshd.nix b/clanModules/sshd.nix index 0112a2ff..939fd327 100644 --- a/clanModules/sshd.nix +++ b/clanModules/sshd.nix @@ -2,7 +2,7 @@ services.openssh.enable = true; services.openssh.hostKeys = [{ - path = config.clanCore.secrets.openssh.secrets."ssh.id_ed25519".path; + path = builtins.storePath config.clanCore.secrets.openssh.secrets."ssh.id_ed25519".path; type = "ed25519"; }]; diff --git a/nixosModules/clanCore/secrets/default.nix b/nixosModules/clanCore/secrets/default.nix index 94a0191b..395acdc7 100644 --- a/nixosModules/clanCore/secrets/default.nix +++ b/nixosModules/clanCore/secrets/default.nix @@ -147,14 +147,14 @@ description = '' path to a fact which is generated by the generator ''; - default = "machines/${config.clanCore.machineName}/facts/${fact.config._module.args.name}"; + default = "${config.clanCore.clanDir}/machines/${config.clanCore.machineName}/facts/${fact.config._module.args.name}"; }; value = lib.mkOption { defaultText = lib.literalExpression "\${config.clanCore.clanDir}/\${fact.config.path}"; type = lib.types.nullOr lib.types.str; default = - if builtins.pathExists "${config.clanCore.clanDir}/${fact.config.path}" then - lib.strings.removeSuffix "\n" (builtins.readFile "${config.clanCore.clanDir}/${fact.config.path}") + if builtins.pathExists fact.config.path then + lib.strings.fileContents fact.config.path else null; };