motiejus/config
1
Fork 0
Code Packages Releases Activity

bugfix in attrset merging

Browse Source
This commit is contained in:
Motiejus Jakštys 2023-09-11 17:48:03 +03:00
parent d1a7aebfc9
commit 27d663e63a
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/base/zfsborg/default.nix
View File

@ -72,7 +72,7 @@ in {
"config.mj.base.unitstatus.enable must be true"; "config.mj.base.unitstatus.enable must be true";
lib.nameValuePair lib.nameValuePair
"${lib.strings.sanitizeDerivationName mountpoint}-${toString i}" "${lib.strings.sanitizeDerivationName mountpoint}-${toString i}"
{ ({
doInit = true; doInit = true;
repo = attrs.repo; repo = attrs.repo;
encryption = { encryption = {
@ -98,7 +98,7 @@ in {
} }
// lib.optionalAttrs (sshKeyPath != null) { // lib.optionalAttrs (sshKeyPath != null) {
environment.BORG_RSH = ''ssh -i "${config.mj.base.zfsborg.sshKeyPath}"''; environment.BORG_RSH = ''ssh -i "${config.mj.base.zfsborg.sshKeyPath}"'';
} })
) )
dirs dirs
); );