diff options
Diffstat (limited to 'flakes')
-rw-r--r-- | flakes/flake.lock | 87 | ||||
-rw-r--r-- | flakes/private/borg_backup/flake.nix | 9 |
2 files changed, 72 insertions, 24 deletions
diff --git a/flakes/flake.lock b/flakes/flake.lock index 4d254d8..b8f281f 100644 --- a/flakes/flake.lock +++ b/flakes/flake.lock | |||
@@ -119,7 +119,7 @@ | |||
119 | }, | 119 | }, |
120 | "locked": { | 120 | "locked": { |
121 | "lastModified": 1, | 121 | "lastModified": 1, |
122 | "narHash": "sha256-8fef5NmMlX9+iOpw1/qXEtJ6cAWFvV/SO6YJs1e3D4U=", | 122 | "narHash": "sha256-Kt/2cr2zTi341YxLHDQAc5aYfEyuoVLpZQ9pJFDjwrc=", |
123 | "path": "../../flakes/private/borg_backup", | 123 | "path": "../../flakes/private/borg_backup", |
124 | "type": "path" | 124 | "type": "path" |
125 | }, | 125 | }, |
@@ -906,6 +906,18 @@ | |||
906 | "type": "path" | 906 | "type": "path" |
907 | } | 907 | } |
908 | }, | 908 | }, |
909 | "environment_36": { | ||
910 | "locked": { | ||
911 | "lastModified": 1, | ||
912 | "narHash": "sha256-PQ5694ARRlpj00lk/C/T0UPGhPO+n0TEcLR1mde0s8M=", | ||
913 | "path": "../environment", | ||
914 | "type": "path" | ||
915 | }, | ||
916 | "original": { | ||
917 | "path": "../environment", | ||
918 | "type": "path" | ||
919 | } | ||
920 | }, | ||
909 | "environment_4": { | 921 | "environment_4": { |
910 | "locked": { | 922 | "locked": { |
911 | "lastModified": 1, | 923 | "lastModified": 1, |
@@ -3806,7 +3818,7 @@ | |||
3806 | }, | 3818 | }, |
3807 | "locked": { | 3819 | "locked": { |
3808 | "lastModified": 1, | 3820 | "lastModified": 1, |
3809 | "narHash": "sha256-eWqhsiYAFY0WoF24muaGHQ86FXgBsiuQ30VY7eOQ5IA=", | 3821 | "narHash": "sha256-0vnHkdR8S1iOAjNl4pQx/Tehv43IfkTw30momDbDWyE=", |
3810 | "path": "../systems/backup-2", | 3822 | "path": "../systems/backup-2", |
3811 | "type": "path" | 3823 | "type": "path" |
3812 | }, | 3824 | }, |
@@ -3878,7 +3890,7 @@ | |||
3878 | }, | 3890 | }, |
3879 | "locked": { | 3891 | "locked": { |
3880 | "lastModified": 1, | 3892 | "lastModified": 1, |
3881 | "narHash": "sha256-74KlRId81x4Vj7fOQBteygUqYLvmKrDvGbQyzl0Zysc=", | 3893 | "narHash": "sha256-DYnB2oXltA+Xqoeaz64z0e1tO5tmaqyV7jq28MK9wiM=", |
3882 | "path": "../systems/eldiron", | 3894 | "path": "../systems/eldiron", |
3883 | "type": "path" | 3895 | "type": "path" |
3884 | }, | 3896 | }, |
@@ -3943,13 +3955,14 @@ | |||
3943 | "impermanence": "impermanence", | 3955 | "impermanence": "impermanence", |
3944 | "my-lib": "my-lib_6", | 3956 | "my-lib": "my-lib_6", |
3945 | "nixpkgs": "nixpkgs_70", | 3957 | "nixpkgs": "nixpkgs_70", |
3958 | "private-borg-backup": "private-borg-backup_2", | ||
3946 | "private-environment": "private-environment_2", | 3959 | "private-environment": "private-environment_2", |
3947 | "private-system": "private-system_2", | 3960 | "private-system": "private-system_2", |
3948 | "public-secrets": "public-secrets_2" | 3961 | "public-secrets": "public-secrets_2" |
3949 | }, | 3962 | }, |
3950 | "locked": { | 3963 | "locked": { |
3951 | "lastModified": 1, | 3964 | "lastModified": 1, |
3952 | "narHash": "sha256-XQ6MS/zL/AVQd71NG8h2mbbxjuRU3dKLi1s2qTY3Z/0=", | 3965 | "narHash": "sha256-xzA9F1DcwBysoy8gVss57IQ2ivWsMCi5PJxLHJDqEUM=", |
3953 | "path": "../systems/zoldene", | 3966 | "path": "../systems/zoldene", |
3954 | "type": "path" | 3967 | "type": "path" |
3955 | }, | 3968 | }, |
@@ -7361,7 +7374,23 @@ | |||
7361 | }, | 7374 | }, |
7362 | "locked": { | 7375 | "locked": { |
7363 | "lastModified": 1, | 7376 | "lastModified": 1, |
7364 | "narHash": "sha256-8fef5NmMlX9+iOpw1/qXEtJ6cAWFvV/SO6YJs1e3D4U=", | 7377 | "narHash": "sha256-Kt/2cr2zTi341YxLHDQAc5aYfEyuoVLpZQ9pJFDjwrc=", |
7378 | "path": "../../flakes/private/borg_backup", | ||
7379 | "type": "path" | ||
7380 | }, | ||
7381 | "original": { | ||
7382 | "path": "../../flakes/private/borg_backup", | ||
7383 | "type": "path" | ||
7384 | } | ||
7385 | }, | ||
7386 | "private-borg-backup_2": { | ||
7387 | "inputs": { | ||
7388 | "environment": "environment_27", | ||
7389 | "secrets": "secrets_21" | ||
7390 | }, | ||
7391 | "locked": { | ||
7392 | "lastModified": 1, | ||
7393 | "narHash": "sha256-Kt/2cr2zTi341YxLHDQAc5aYfEyuoVLpZQ9pJFDjwrc=", | ||
7365 | "path": "../../flakes/private/borg_backup", | 7394 | "path": "../../flakes/private/borg_backup", |
7366 | "type": "path" | 7395 | "type": "path" |
7367 | }, | 7396 | }, |
@@ -7581,7 +7610,7 @@ | |||
7581 | "private-system_2": { | 7610 | "private-system_2": { |
7582 | "inputs": { | 7611 | "inputs": { |
7583 | "backports": "backports_6", | 7612 | "backports": "backports_6", |
7584 | "environment": "environment_27", | 7613 | "environment": "environment_28", |
7585 | "mypackages": "mypackages_9", | 7614 | "mypackages": "mypackages_9", |
7586 | "myuids": "myuids_28", | 7615 | "myuids": "myuids_28", |
7587 | "secrets-public": "secrets-public_6" | 7616 | "secrets-public": "secrets-public_6" |
@@ -7958,7 +7987,7 @@ | |||
7958 | "s-secrets": "s-secrets", | 7987 | "s-secrets": "s-secrets", |
7959 | "s-surfer": "s-surfer", | 7988 | "s-surfer": "s-surfer", |
7960 | "s-taskwarrior-web": "s-taskwarrior-web", | 7989 | "s-taskwarrior-web": "s-taskwarrior-web", |
7961 | "secrets": "secrets_28" | 7990 | "secrets": "secrets_29" |
7962 | } | 7991 | } |
7963 | }, | 7992 | }, |
7964 | "rsync_backup": { | 7993 | "rsync_backup": { |
@@ -8279,12 +8308,12 @@ | |||
8279 | }, | 8308 | }, |
8280 | "s-private-borg-backup": { | 8309 | "s-private-borg-backup": { |
8281 | "inputs": { | 8310 | "inputs": { |
8282 | "environment": "environment_28", | 8311 | "environment": "environment_29", |
8283 | "secrets": "secrets_21" | 8312 | "secrets": "secrets_22" |
8284 | }, | 8313 | }, |
8285 | "locked": { | 8314 | "locked": { |
8286 | "lastModified": 1, | 8315 | "lastModified": 1, |
8287 | "narHash": "sha256-8fef5NmMlX9+iOpw1/qXEtJ6cAWFvV/SO6YJs1e3D4U=", | 8316 | "narHash": "sha256-Kt/2cr2zTi341YxLHDQAc5aYfEyuoVLpZQ9pJFDjwrc=", |
8288 | "path": "./private/borg_backup", | 8317 | "path": "./private/borg_backup", |
8289 | "type": "path" | 8318 | "type": "path" |
8290 | }, | 8319 | }, |
@@ -8312,7 +8341,7 @@ | |||
8312 | }, | 8341 | }, |
8313 | "s-private-chatons": { | 8342 | "s-private-chatons": { |
8314 | "inputs": { | 8343 | "inputs": { |
8315 | "environment": "environment_29" | 8344 | "environment": "environment_30" |
8316 | }, | 8345 | }, |
8317 | "locked": { | 8346 | "locked": { |
8318 | "lastModified": 1, | 8347 | "lastModified": 1, |
@@ -8339,8 +8368,8 @@ | |||
8339 | }, | 8368 | }, |
8340 | "s-private-mail-relay": { | 8369 | "s-private-mail-relay": { |
8341 | "inputs": { | 8370 | "inputs": { |
8342 | "environment": "environment_30", | 8371 | "environment": "environment_31", |
8343 | "secrets": "secrets_22" | 8372 | "secrets": "secrets_23" |
8344 | }, | 8373 | }, |
8345 | "locked": { | 8374 | "locked": { |
8346 | "lastModified": 1, | 8375 | "lastModified": 1, |
@@ -8355,11 +8384,11 @@ | |||
8355 | }, | 8384 | }, |
8356 | "s-private-milters": { | 8385 | "s-private-milters": { |
8357 | "inputs": { | 8386 | "inputs": { |
8358 | "environment": "environment_31", | 8387 | "environment": "environment_32", |
8359 | "files-watcher": "files-watcher_13", | 8388 | "files-watcher": "files-watcher_13", |
8360 | "openarc": "openarc_12", | 8389 | "openarc": "openarc_12", |
8361 | "opendmarc": "opendmarc_6", | 8390 | "opendmarc": "opendmarc_6", |
8362 | "secrets": "secrets_23" | 8391 | "secrets": "secrets_24" |
8363 | }, | 8392 | }, |
8364 | "locked": { | 8393 | "locked": { |
8365 | "lastModified": 1, | 8394 | "lastModified": 1, |
@@ -8374,10 +8403,10 @@ | |||
8374 | }, | 8403 | }, |
8375 | "s-private-monitoring": { | 8404 | "s-private-monitoring": { |
8376 | "inputs": { | 8405 | "inputs": { |
8377 | "environment": "environment_32", | 8406 | "environment": "environment_33", |
8378 | "naemon": "naemon_6", | 8407 | "naemon": "naemon_6", |
8379 | "nixpkgs-lib": "nixpkgs-lib_26", | 8408 | "nixpkgs-lib": "nixpkgs-lib_26", |
8380 | "secrets": "secrets_24" | 8409 | "secrets": "secrets_25" |
8381 | }, | 8410 | }, |
8382 | "locked": { | 8411 | "locked": { |
8383 | "lastModified": 1, | 8412 | "lastModified": 1, |
@@ -8394,7 +8423,7 @@ | |||
8394 | "inputs": { | 8423 | "inputs": { |
8395 | "files-watcher": "files-watcher_14", | 8424 | "files-watcher": "files-watcher_14", |
8396 | "openarc": "openarc_14", | 8425 | "openarc": "openarc_14", |
8397 | "secrets": "secrets_25" | 8426 | "secrets": "secrets_26" |
8398 | }, | 8427 | }, |
8399 | "locked": { | 8428 | "locked": { |
8400 | "lastModified": 1, | 8429 | "lastModified": 1, |
@@ -8409,10 +8438,10 @@ | |||
8409 | }, | 8438 | }, |
8410 | "s-private-opendmarc": { | 8439 | "s-private-opendmarc": { |
8411 | "inputs": { | 8440 | "inputs": { |
8412 | "environment": "environment_33", | 8441 | "environment": "environment_34", |
8413 | "files-watcher": "files-watcher_15", | 8442 | "files-watcher": "files-watcher_15", |
8414 | "opendmarc": "opendmarc_7", | 8443 | "opendmarc": "opendmarc_7", |
8415 | "secrets": "secrets_26" | 8444 | "secrets": "secrets_27" |
8416 | }, | 8445 | }, |
8417 | "locked": { | 8446 | "locked": { |
8418 | "lastModified": 1, | 8447 | "lastModified": 1, |
@@ -8472,8 +8501,8 @@ | |||
8472 | }, | 8501 | }, |
8473 | "s-private-ssh": { | 8502 | "s-private-ssh": { |
8474 | "inputs": { | 8503 | "inputs": { |
8475 | "environment": "environment_34", | 8504 | "environment": "environment_35", |
8476 | "secrets": "secrets_27" | 8505 | "secrets": "secrets_28" |
8477 | }, | 8506 | }, |
8478 | "locked": { | 8507 | "locked": { |
8479 | "lastModified": 1, | 8508 | "lastModified": 1, |
@@ -8489,7 +8518,7 @@ | |||
8489 | "s-private-system": { | 8518 | "s-private-system": { |
8490 | "inputs": { | 8519 | "inputs": { |
8491 | "backports": "backports_7", | 8520 | "backports": "backports_7", |
8492 | "environment": "environment_35", | 8521 | "environment": "environment_36", |
8493 | "mypackages": "mypackages_12", | 8522 | "mypackages": "mypackages_12", |
8494 | "myuids": "myuids_42", | 8523 | "myuids": "myuids_42", |
8495 | "secrets-public": "secrets-public_7" | 8524 | "secrets-public": "secrets-public_7" |
@@ -8891,6 +8920,18 @@ | |||
8891 | "secrets_28": { | 8920 | "secrets_28": { |
8892 | "locked": { | 8921 | "locked": { |
8893 | "lastModified": 1, | 8922 | "lastModified": 1, |
8923 | "narHash": "sha256-5AakznhrJFmwCD7lr4JEh55MtdAJL6WA/YuBks6ISSE=", | ||
8924 | "path": "../../secrets", | ||
8925 | "type": "path" | ||
8926 | }, | ||
8927 | "original": { | ||
8928 | "path": "../../secrets", | ||
8929 | "type": "path" | ||
8930 | } | ||
8931 | }, | ||
8932 | "secrets_29": { | ||
8933 | "locked": { | ||
8934 | "lastModified": 1, | ||
8894 | "narHash": "sha256-yvhc2jxW1AQVmtrKPoYPr5DgpXKt/ua+ATuxvE3iY6c=", | 8935 | "narHash": "sha256-yvhc2jxW1AQVmtrKPoYPr5DgpXKt/ua+ATuxvE3iY6c=", |
8895 | "path": "./private/environment-dummy", | 8936 | "path": "./private/environment-dummy", |
8896 | "type": "path" | 8937 | "type": "path" |
diff --git a/flakes/private/borg_backup/flake.nix b/flakes/private/borg_backup/flake.nix index ad7d6eb..ab288f6 100644 --- a/flakes/private/borg_backup/flake.nix +++ b/flakes/private/borg_backup/flake.nix | |||
@@ -130,6 +130,13 @@ | |||
130 | Whether to enable remote backups. | 130 | Whether to enable remote backups. |
131 | ''; | 131 | ''; |
132 | }; | 132 | }; |
133 | services.borgBackup.cronSpec = lib.mkOption { | ||
134 | type = lib.types.str; | ||
135 | default = "0 0 * * *"; | ||
136 | description = '' | ||
137 | Cron spec for running borgbackup | ||
138 | ''; | ||
139 | }; | ||
133 | services.borgBackup.helpers = lib.mkOption { | 140 | services.borgBackup.helpers = lib.mkOption { |
134 | readOnly = true; | 141 | readOnly = true; |
135 | description = '' | 142 | description = '' |
@@ -310,7 +317,7 @@ | |||
310 | services.cron = { | 317 | services.cron = { |
311 | enable = true; | 318 | enable = true; |
312 | systemCronJobs = [ | 319 | systemCronJobs = [ |
313 | "0 0 * * * root ${borg_backup}/bin/borg_backup 300" | 320 | "${config.services.borgBackup.cronSpec} root ${borg_backup}/bin/borg_backup 300" |
314 | ]; | 321 | ]; |
315 | 322 | ||
316 | }; | 323 | }; |