From 34047a49b4d7165dea5fd5302739ccf767da1fcb Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Fri, 15 Dec 2023 14:14:15 +0800 Subject: [PATCH] tasks/backup-archive: migrate as ni's host-specific module In practice, this is only used by it. --- hosts/ni/default.nix | 1 + hosts/ni/modules/default.nix | 1 + .../ni/modules/services/backup}/default.nix | 7 ++++--- .../ni/modules/services/backup}/desktop-backup.pub | 0 .../ni/modules/services/backup/secrets.yaml | 0 modules/nixos/default.nix | 1 - modules/nixos/tasks/backup-archive/README.adoc | 5 ----- 7 files changed, 6 insertions(+), 9 deletions(-) rename {modules/nixos/tasks/backup-archive => hosts/ni/modules/services/backup}/default.nix (96%) rename {modules/nixos/tasks/backup-archive => hosts/ni/modules/services/backup}/desktop-backup.pub (100%) rename secrets/backup-archive.yaml => hosts/ni/modules/services/backup/secrets.yaml (100%) delete mode 100644 modules/nixos/tasks/backup-archive/README.adoc diff --git a/hosts/ni/default.nix b/hosts/ni/default.nix index eb4b1f18..107df0c1 100644 --- a/hosts/ni/default.nix +++ b/hosts/ni/default.nix @@ -32,6 +32,7 @@ setup = "networkmanager"; wireguard.enable = true; }; + services.backup.enable = true; setups = { desktop.enable = true; development.enable = true; diff --git a/hosts/ni/modules/default.nix b/hosts/ni/modules/default.nix index 7b6426d2..6fbf7cc8 100644 --- a/hosts/ni/modules/default.nix +++ b/hosts/ni/modules/default.nix @@ -4,6 +4,7 @@ ./hardware/qol.nix ./networking/setup.nix ./networking/wireguard.nix + ./services/backup ./setups/desktop.nix ./setups/development.nix ./setups/gaming.nix diff --git a/modules/nixos/tasks/backup-archive/default.nix b/hosts/ni/modules/services/backup/default.nix similarity index 96% rename from modules/nixos/tasks/backup-archive/default.nix rename to hosts/ni/modules/services/backup/default.nix index 16ed0b29..eda543a0 100644 --- a/modules/nixos/tasks/backup-archive/default.nix +++ b/hosts/ni/modules/services/backup/default.nix @@ -2,7 +2,8 @@ { config, lib, pkgs, ... }: let - cfg = config.tasks.backup-archive; + hostCfg = config.hosts.ni; + cfg = hostCfg.services.backup; borgJobCommonSetting = { patterns ? [ ], passCommand }: { compression = "zstd,12"; @@ -42,12 +43,12 @@ let pathPrefix = "borg-backup"; in { - options.tasks.backup-archive.enable = + options.hosts.ni.services.backup.enable = lib.mkEnableOption "backup setup with BorgBackup"; config = lib.mkIf cfg.enable { sops.secrets = lib.getSecrets - (lib.getSecret "backup-archive.yaml") + ./secrets.yaml (lib.attachSopsPathPrefix pathPrefix { "patterns/home" = { }; "patterns/etc" = { }; diff --git a/modules/nixos/tasks/backup-archive/desktop-backup.pub b/hosts/ni/modules/services/backup/desktop-backup.pub similarity index 100% rename from modules/nixos/tasks/backup-archive/desktop-backup.pub rename to hosts/ni/modules/services/backup/desktop-backup.pub diff --git a/secrets/backup-archive.yaml b/hosts/ni/modules/services/backup/secrets.yaml similarity index 100% rename from secrets/backup-archive.yaml rename to hosts/ni/modules/services/backup/secrets.yaml diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 2ebefc47..492ba3b6 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -29,7 +29,6 @@ let ./profiles/i18n.nix ./profiles/server.nix ./profiles/vpn.nix - ./tasks/backup-archive ./tasks/multimedia-archive ]; in diff --git a/modules/nixos/tasks/backup-archive/README.adoc b/modules/nixos/tasks/backup-archive/README.adoc deleted file mode 100644 index 0003808b..00000000 --- a/modules/nixos/tasks/backup-archive/README.adoc +++ /dev/null @@ -1,5 +0,0 @@ -= BorgBackup setup for the archive - -It's a NixOS configuration that configures my basic BorgBackup backup battlestation for my local archive. -Not all of the required files are here (i.e., the SSH key used for Borg). -In other words, if it's not yours, don't attempt to activate this setup.