diff --git a/.github/workflows/cachix.yaml b/.github/workflows/cachix.yaml index accf269..b9bebfb 100644 --- a/.github/workflows/cachix.yaml +++ b/.github/workflows/cachix.yaml @@ -45,6 +45,7 @@ jobs: strategy: matrix: name: + - boreal - zephyrus steps: diff --git a/hosts/boreal/default.nix b/hosts/boreal/default.nix index 8116755..9175f92 100644 --- a/hosts/boreal/default.nix +++ b/hosts/boreal/default.nix @@ -3,9 +3,6 @@ # and in the NixOS manual (accessible by running ‘nixos-help’). { config, lib, pkgs, ... }: -let - secrets = config.my.secrets; -in { imports = [ # Include the results of the hardware scan. @@ -46,17 +43,12 @@ in # List services that you want to enable: my.services = { - borg-backup = { + restic-backup = { enable = true; - repo = secrets.borg-backup.boreal-repo; - # for a workstation, having backups spanning the last month should be - # enough - prune = { - keep = { - daily = 7; - weekly = 4; - }; - }; + repo = "b2:boreal-backup"; + passwordFile = config.age.secrets."restic-backup/boreal-password".path; + environmentFile = config.age.secrets."restic-backup/boreal-credentials".path; + paths = [ "/home/alarsyo" ]; diff --git a/modules/secrets/restic-backup/boreal-credentials.age b/modules/secrets/restic-backup/boreal-credentials.age new file mode 100644 index 0000000..e7827ac --- /dev/null +++ b/modules/secrets/restic-backup/boreal-credentials.age @@ -0,0 +1,10 @@ +age-encryption.org/v1 +-> ssh-ed25519 YWMQkg B5tQXcUdu751YYA4Y8uRH/DgGDi24AsXEAKkCVfg+Ro +21Gz0MsMCtWzUdVuaWdNwEU9Ts8lOQWCd7Ejf2tkxks +-> ssh-ed25519 k2gHjw NIG04WnNgq5bnSl9KmvFyvpGdFlmOFtXzuYtrsFOKXM +ZYZVyIM0jnhguRmfIpRtFg0StgYTlu/P9bgxBy9dbOg +-> u5-grease +MTgqDb6tqCuvdlXj9c2Y3XX1X7JfrdeKLM0EQ75ZJe+Hrntnpvn4fSlBr8QoOahm +fg +--- VzgNZ3/IBQVeYfOMGjnHPDRKoBDdxHth61pevk5+fLw +D &vN1t8w<wd>s:G_ƚyu,%@Jh"EvX \ No newline at end of file diff --git a/modules/secrets/restic-backup/boreal-password.age b/modules/secrets/restic-backup/boreal-password.age new file mode 100644 index 0000000..95176ee Binary files /dev/null and b/modules/secrets/restic-backup/boreal-password.age differ diff --git a/modules/secrets/secrets.nix b/modules/secrets/secrets.nix index 0a0d1cd..5e3fec2 100644 --- a/modules/secrets/secrets.nix +++ b/modules/secrets/secrets.nix @@ -11,6 +11,8 @@ let all = users ++ machines; in { + "restic-backup/boreal-password.age".publicKeys = [ alarsyo boreal ]; + "restic-backup/boreal-credentials.age".publicKeys = [ alarsyo boreal ]; "restic-backup/zephyrus-password.age".publicKeys = [ alarsyo zephyrus ]; "restic-backup/zephyrus-credentials.age".publicKeys = [ alarsyo zephyrus ]; diff --git a/secrets/borg-backup/boreal-repo.secret b/secrets/borg-backup/boreal-repo.secret deleted file mode 100644 index db1104e..0000000 Binary files a/secrets/borg-backup/boreal-repo.secret and /dev/null differ diff --git a/secrets/borg-backup/default.nix b/secrets/borg-backup/default.nix index b611715..e9a3e7a 100644 --- a/secrets/borg-backup/default.nix +++ b/secrets/borg-backup/default.nix @@ -5,6 +5,5 @@ let ; in { - boreal-repo = fileContents ./boreal-repo.secret; poseidon-repo = fileContents ./poseidon-repo.secret; }