From d0f2f77fa0eca42bb66f2cc286f226df3bbf4c64 Mon Sep 17 00:00:00 2001 From: foehammer127 Date: Tue, 4 Feb 2025 14:02:19 -0600 Subject: [PATCH] Remove foehammer backups abstraction, since it was possibly leaky. --- machines/lebesgue/config/state.nix | 17 ++++++++--------- nixos/common/backups.nix | 11 ----------- nixos/common/services/vaultwarden.nix | 4 ---- 3 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 nixos/common/backups.nix diff --git a/machines/lebesgue/config/state.nix b/machines/lebesgue/config/state.nix index a63744c..b2262ab 100644 --- a/machines/lebesgue/config/state.nix +++ b/machines/lebesgue/config/state.nix @@ -2,15 +2,14 @@ sops.age.sshKeyPaths = ["/persist/etc/ssh/ssh_host_ed25519_key"]; environment.persistence."/persist" = { - directories = - [ - "/var/lib/tailscale" - "/var/log" - "/var/lib/nixos" - "/var/lib/docker" - "/var/lib/caddy/.local/share/caddy" - ] - ++ config.foehammer.backups.paths; + directories = [ + "/var/lib/tailscale" + "/var/log" + "/var/lib/nixos" + "/var/lib/docker" + "/var/lib/caddy/.local/share/caddy" + "/var/lib/vaultwarden" + ]; files = [ "/etc/machine-id" diff --git a/nixos/common/backups.nix b/nixos/common/backups.nix deleted file mode 100644 index a1474b6..0000000 --- a/nixos/common/backups.nix +++ /dev/null @@ -1,11 +0,0 @@ -{lib, ...}: let - inherit (lib) mkOption types; -in { - # Generic Backups. - options.foehammer.backups = { - paths = mkOption { - type = types.nullOr (types.listOf types.str); - default = []; - }; - }; -} diff --git a/nixos/common/services/vaultwarden.nix b/nixos/common/services/vaultwarden.nix index 8463adf..2fbe7aa 100644 --- a/nixos/common/services/vaultwarden.nix +++ b/nixos/common/services/vaultwarden.nix @@ -47,9 +47,5 @@ in { environmentFile = cfg.envPath; }; - - foehammer.backups.paths = [ - "/var/lib/vaultwarden" - ]; }; }