From 49d92971c96e4835ff8125048ef8299278f00b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Tue, 12 Sep 2023 11:41:45 +0300
Subject: [PATCH] pass BORG_HOST_ID correctly

---
 modules/base/zfsborg/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/base/zfsborg/default.nix b/modules/base/zfsborg/default.nix
index 76694cf..eaf4780 100644
--- a/modules/base/zfsborg/default.nix
+++ b/modules/base/zfsborg/default.nix
@@ -92,15 +92,16 @@ in {
                     weekly = 4;
                     monthly = 3;
                   };
-                  environment.BORG_HOST_ID = let
-                    h = config.networking;
-                  in "${h.hostName}.${h.domain}@${h.hostId}";
+                  environment = {
+                    BORG_HOST_ID = let
+                      h = config.networking;
+                    in "${h.hostName}.${h.domain}@${h.hostId}";
+                  } // lib.optionalAttrs (sshKeyPath != null) {
+                    BORG_RSH = ''ssh -i "${config.mj.base.zfsborg.sshKeyPath}"'';
+                  };
                 }
                 // lib.optionalAttrs (attrs ? patterns) {
                   patterns = attrs.patterns;
-                }
-                // lib.optionalAttrs (sshKeyPath != null) {
-                  environment.BORG_RSH = ''ssh -i "${config.mj.base.zfsborg.sshKeyPath}"'';
                 })
         )
         dirs