diff --git a/lib/modules/rclone.nix b/lib/modules/rclone.nix index 6814ac9..7e5956e 100644 --- a/lib/modules/rclone.nix +++ b/lib/modules/rclone.nix @@ -58,7 +58,7 @@ let path = lib.mkOption { type = lib.types.str; description = "The path to mount the remote file system to."; - default = "$HOME/.mnt/${lib.escapeShellArg name}"; + default = ''"$HOME"/.mnt/${lib.escapeShellArg name}''; }; autoStart = lib.mkOption { @@ -148,10 +148,14 @@ let config = { secretsScript = lib.strings.concatLines - (builtins.attrValues ( - builtins.mapAttrs - (name: path: "export ${name}=\"$(cat ${lib.escapeShellArg path})\"") - config.secrets)); + (builtins.concatLists + (builtins.attrValues ( + builtins.mapAttrs + (name: path: [ + "${name}=\"$(cat ${lib.escapeShellArg path})\"" + "export ${name}" + ]) + config.secrets))); args = config.extraArgs ++ ( let