treefmt v2.5.0traversed 284 files emitted 256 files for processing formatted 256 files (3 changed) in 640ms M modules/rustic/checks.nix M modules/rustic/config.nix M modules/rustic/options.nix diff --git a/modules/rustic/checks.nix b/modules/rustic/checks.nix index 8497322..1c49d42 100644 --- a/modules/rustic/checks.nix +++ b/modules/rustic/checks.nix @@ -1,4 +1,4 @@ -{ inputs, self, ... }: +{ inputs, ... }: { perSystem = { diff --git a/modules/rustic/config.nix b/modules/rustic/config.nix index 4b2b948..a01a3d3 100644 --- a/modules/rustic/config.nix +++ b/modules/rustic/config.nix @@ -70,7 +70,7 @@ let // repo.repositoryOptions; }; backup.host = repo.host; - forget = repo.forget; + inherit (repo) forget; } ) cfg.repositories; @@ -332,9 +332,9 @@ let serviceKind: descriptionKind: mkScript: name: backup: lib.nameValuePair "rustic-backup-${serviceKind}-${name}" (mkJobService { description = "Rustic ${descriptionKind} backup: ${name}"; - user = backup.user; + inherit (backup) user; execStart = "${mkScript name backup}"; - startAt = backup.startAt; + inherit (backup) startAt; after = [ "rustic-init-${backup.repository}.service" ]; requires = [ "rustic-init-${backup.repository}.service" ]; }); @@ -349,7 +349,7 @@ let description = "Rustic PostgreSQL backup: ${name}"; user = "root"; execStart = "${mkPostgresBackupScript name backup}"; - startAt = backup.startAt; + inherit (backup) startAt; after = postgresDependencies name; requires = postgresDependencies name; }; diff --git a/modules/rustic/options.nix b/modules/rustic/options.nix index 57146bf..0fa4ce8 100644 --- a/modules/rustic/options.nix +++ b/modules/rustic/options.nix @@ -134,7 +134,7 @@ in }; forget = lib.mkOption { - type = tomlFormat.type; + inherit (tomlFormat) type; default = { keep-daily = 7; keep-weekly = 4;