From 9619c3cbe3f5eebf0445654209274f61d99a71b0 Mon Sep 17 00:00:00 2001 From: Riley Apeldoorn Date: Thu, 15 Jun 2023 20:39:45 +0200 Subject: [PATCH] Enable backups for strawberry --- flake.nix | 1 + secret/backblaze.age | 21 ++++++++++++--------- secrets.nix | 14 ++++++++------ shared/core/default.nix | 1 + system/strawberry/core.nix | 1 + system/strawberry/keys/root.pub | 1 + 6 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 system/strawberry/keys/root.pub diff --git a/flake.nix b/flake.nix index b1f7633..1e19955 100644 --- a/flake.nix +++ b/flake.nix @@ -36,6 +36,7 @@ agenix.nixosModules.default ./system/strawberry/core.nix ./shared/core + ./shared/secrets.nix ]; specialArgs = args; }; diff --git a/secret/backblaze.age b/secret/backblaze.age index 0fe0632..7a0e039 100644 --- a/secret/backblaze.age +++ b/secret/backblaze.age @@ -1,10 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 WzdOcw /csNPlpruF3Qq1YHu2sf9AUZVrECvlo9kQ+d/U7SsDY -grIBod4k2TvmiYh5rhh/mWfg37ezuRYz5sgw8jI3sVw --> ssh-ed25519 tvCYbQ NNrvjiXnK+QnKcyXyGEQdGkGYOHma9IXS+xXt5kKlkY -YRoXtSrYy+6c92J8+A3i1R6WZWAApsBDdg4lnZzV534 --> j58*}-grease -LZ i -Rvy8Armemfb+G1DyL1JbbvQsfRbVeWgte507ozmnUjL3q+tUspegA5XxOA15XwVM -wHCjU9FYC+WgL8a2m65vDs4 ---- Mwn5PvXnc54IJ1JGFAZ3E4oErHBfPZImj58twTviCVo -<[>"PȨ݄bš/\o)7tS{@pQ:ܕKY >kK3t꒡=wR Aj 4;B蠘1z>XȪPx']8mֶ\xJ/NJN2 \ No newline at end of file +-> ssh-ed25519 WzdOcw +G45tWielvhzLS+4KWh9vKo7nUlXZU5pC9XUHJ+lITg +iyznrg1UPA0DAkRPyjfYretMIeF32O+ej4QARUIDXPM +-> ssh-ed25519 qlXMTg GVBSMuYGSZDZUYvBd+jRQr5QgcFKjXKPNIr7PQYFfm8 +dqQB4AEhU5PFNeyI3dBnIAoRo1X7vypNz0pCd9hb6Vc +-> ssh-ed25519 tvCYbQ HqrKfYn9NHjv+X996pU8kCJl17juaZBrD1hPWJacGVU +3lFVji0VCQciHewFQJ9yEj+anhVdQ13gif0s7Pyu1L8 +-> KgQ[5-grease " xDo<4{l: xJ y+$GwT+ +VtYV6LGrhE52cf/+baTLxlGlHXEKqjVy0A +--- Qhc+wm4WQIL2elyAiv/M14r6pyvuFSbwRzBV9hQjT94 +٬Yhnڐo[D[iT6H@j4v 4˜+R2fOx 6;S> w%y˼[$-j"Ah2Q +~QM;]E6mNKz* +c;rDGB=+kI.H+O"~4K \ No newline at end of file diff --git a/secrets.nix b/secrets.nix index d8b4bde..731359f 100644 --- a/secrets.nix +++ b/secrets.nix @@ -1,9 +1,11 @@ -let strawberry = builtins.readFile ./system/strawberry/keys/riley.pub; - dev-lt-63 = builtins.readFile ./system/dev-lt-63/keys/riley.pub; +let strawberry = [ + (builtins.readFile ./system/strawberry/keys/riley.pub) + (builtins.readFile ./system/strawberry/keys/root.pub) + ]; + dev-lt-63 = [ + (builtins.readFile ./system/dev-lt-63/keys/riley.pub) + ]; in { # Secrets for backup cloud storage provider - "secret/backblaze.age".publicKeys = [ - strawberry - dev-lt-63 - ]; + "secret/backblaze.age".publicKeys = strawberry ++ dev-lt-63; } \ No newline at end of file diff --git a/shared/core/default.nix b/shared/core/default.nix index 9709b26..8c33cba 100644 --- a/shared/core/default.nix +++ b/shared/core/default.nix @@ -3,6 +3,7 @@ { imports = [ + ./backups.nix ./gui.nix ./nix.nix ./ssh.nix diff --git a/system/strawberry/core.nix b/system/strawberry/core.nix index 7b1a5cd..46ccc7a 100644 --- a/system/strawberry/core.nix +++ b/system/strawberry/core.nix @@ -2,6 +2,7 @@ custom = { gui.enable = true; + backups.enable = true; }; system.stateVersion = "21.11"; diff --git a/system/strawberry/keys/root.pub b/system/strawberry/keys/root.pub new file mode 100644 index 0000000..e0881d5 --- /dev/null +++ b/system/strawberry/keys/root.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILniE+LdfdV9V9+Zj5gJXqKEv1CzQaEySy1u5OdbKa8d root@strawberry