Merge e5d4435cf1 into 24a7ea3905

Merge pull request #256 from spectre256/main
fix: allow for newlines in keys
2024-04-26 15:44:21 +02:00 · 2024-04-26 05:59:12 -07:00 · 2024-04-12 17:50:07 -04:00 · 2023-11-15 18:26:54 +00:00
2 changed files with 4 additions and 1 deletions
--- a/modules/age-home.nix
+++ b/modules/age-home.nix
@ -211,6 +211,7 @@ in {
    systemd.user.services.agenix = lib.mkIf pkgs.stdenv.hostPlatform.isLinux {
      Unit = {
        Description = "agenix activation";
+        After = "basic.target"  # “basic boot-up,” includes impermanence's bind mounts
      };
      Service = {
        Type = "oneshot";
--- a/pkgs/agenix.sh
+++ b/pkgs/agenix.sh
@ -171,7 +171,9 @@ function edit {
    ENCRYPT=()
    while IFS= read -r key
    do
-        ENCRYPT+=(--recipient "$key")
+        if [ -n "$key" ]; then
+            ENCRYPT+=(--recipient "$key")
+        fi
    done <<< "$KEYS"

    REENCRYPTED_DIR=$(@mktempBin@ -d)
Author	SHA1	Message	Date
nicoo	c12b308fef	Merge `e5d4435cf1` into `24a7ea3905`	2024-04-26 15:44:21 +02:00
Ryan Mulligan	24a7ea3905	Merge pull request #256 from spectre256/main fix: allow for newlines in keys	2024-04-26 05:59:12 -07:00
Ellis Gibbons	2c1d1fb134	fix: allow for newlines in keys	2024-04-12 17:50:07 -04:00
nicoo	e5d4435cf1	age-home: Order `agenix.service` after `basic.target` Closes #219	2023-11-15 18:26:54 +00:00