From 1a54eab3fb893595ca15a7719a5ab693eb0b1d1a Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Mon, 30 Sep 2024 11:16:19 +0530 Subject: [PATCH] fix: pass lib to backup module and fixup backup configuration Signed-off-by: Chinmay D. Pai --- modules/nixos/services/backup/default.nix | 7 ++----- modules/nixos/services/paperless/default.nix | 2 +- modules/nixos/services/vaultwarden/default.nix | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/nixos/services/backup/default.nix b/modules/nixos/services/backup/default.nix index c43f800..5e40ac0 100644 --- a/modules/nixos/services/backup/default.nix +++ b/modules/nixos/services/backup/default.nix @@ -3,9 +3,7 @@ lib, ... }: -with lib; let - inherit (utils.systemdUtils.unitOptions) unitOption; -in { +with lib; { options.snowflake.services.backups = { enable = mkEnableOption "Enable restic backup service"; @@ -27,7 +25,7 @@ in { default = {}; type = types.attrsOf ( types.submodule ( - {_}: { + {lib, ...}: { options = { dynamicFilesFrom = mkOption { type = types.nullOr types.str; @@ -63,7 +61,6 @@ in { }; timerConfig = mkOption { - type = types.attrsOf unitOption; default = { OnCalendar = "daily"; }; diff --git a/modules/nixos/services/paperless/default.nix b/modules/nixos/services/paperless/default.nix index 2d42615..bae1a68 100644 --- a/modules/nixos/services/paperless/default.nix +++ b/modules/nixos/services/paperless/default.nix @@ -64,7 +64,7 @@ }; }; - snowflake.services.backups.paperless.config = { + snowflake.services.backups.config.paperless = { dynamicFilesFrom = let path = config.services.paperless.dataDir; in '' diff --git a/modules/nixos/services/vaultwarden/default.nix b/modules/nixos/services/vaultwarden/default.nix index 6a02bd1..daeba0e 100644 --- a/modules/nixos/services/vaultwarden/default.nix +++ b/modules/nixos/services/vaultwarden/default.nix @@ -77,7 +77,7 @@ }; }; - snowflake.services.backups.vaultwarden.paths = [ + snowflake.services.backups.config.vaultwarden.paths = [ "/var/lib/bitwarden_rs" ]; };