From 19aa8a554ed65ba43fbc66130fb4488660b88234 Mon Sep 17 00:00:00 2001
From: cy <hi@cything.io>
Date: Thu, 26 Dec 2024 19:30:22 -0500
Subject: [PATCH] include rclone config in secrets

---
 hosts/chunk/default.nix   | 2 +-
 hosts/chunk/rclone.nix    | 3 +--
 secrets/rclone/chunk.yaml | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/hosts/chunk/default.nix b/hosts/chunk/default.nix
index 0b17cb0..2bd7475 100644
--- a/hosts/chunk/default.nix
+++ b/hosts/chunk/default.nix
@@ -36,7 +36,7 @@
     "services/ntfy" = {
       sopsFile = ../../secrets/services/ntfy.yaml;
     };
-    "rclone/env" = {
+    "rclone/config" = {
       sopsFile = ../../secrets/rclone/chunk.yaml;
     };
     "vaultwarden/env" = {
diff --git a/hosts/chunk/rclone.nix b/hosts/chunk/rclone.nix
index 8cdf739..7963f67 100644
--- a/hosts/chunk/rclone.nix
+++ b/hosts/chunk/rclone.nix
@@ -13,9 +13,8 @@
     serviceConfig = {
       Type = "notify";
       ExecStartPre = "/usr/bin/env mkdir -p /mnt/photos";
-      ExecStart = "${pkgs.rclone}/bin/rclone mount --config /home/yt/.config/rclone/rclone.conf --cache-dir /var/cache/rclone --transfers=32 --dir-cache-time 72h --vfs-cache-mode writes --vfs-cache-max-size 2G photos: /mnt/photos ";
+      ExecStart = "${pkgs.rclone}/bin/rclone mount --config ${config.sops.secrets."rclone/config".path} --cache-dir /var/cache/rclone --transfers=32 --dir-cache-time 72h --vfs-cache-mode writes --vfs-cache-max-size 2G photos: /mnt/photos ";
       ExecStop = "${pkgs.fuse}/bin/fusermount -u /mnt/photos";
-      EnvironmentFile = config.sops.secrets."rclone/env".path;
     };
   };
 
diff --git a/secrets/rclone/chunk.yaml b/secrets/rclone/chunk.yaml
index 2286ad6..a723f2d 100644
--- a/secrets/rclone/chunk.yaml
+++ b/secrets/rclone/chunk.yaml
@@ -1,5 +1,5 @@
 rclone:
-    env: ENC[AES256_GCM,data:e8O4cUbgFMseJTvzGyBhsD/beCkhuh/Sl4ZHqV/kQodcuKi3V9XHyeCAnBb/,iv:rOySfX7vQ1mduFEL4gSbM8rYk9Gp7aEcieV1CW+aGDk=,tag:aWmdde3Xv9IqLRigPZBH1w==,type:str]
+    config: ENC[AES256_GCM,data:uzidNAZb2mlckAg3d3H2Svv4yQYHUVHjhSrlJKHVqVSi96bZ1uUM6QIqVVVdrNHwFdRHayqTnn81jIuDvUThCA+Bs7sJ8ttf7D0sZxZgBfb0OIyM6RbQKUVbb/KZ1Yi7DXmGkLvYlBZAjXzYBGjRaN5M/rm4WANrfsoanCwl7IK3BIgd2K27KliUNu/GgTc4HRmQG2jdJlynKuEh7OzgDtQyXgUebGWhwrClTlWsbtqlU8IfaYVvnAeOTDhobtx+BI5La6NX2qHb8B/N5lDwkmF0euXGWBwwcBSjaCe4ZdVXJnNfG1po8P/Ovq9vDciST6/xqW8TtecmEYvKQysiOjdUVxR2QkNOVqXtdxkhdSV3UIed8eC5s+ND9/Ko1ibkNGP7s3rSYP0XaBy6c/9MlnwSoqGybXAsR5VVLwUH9sYMRulywJWXLScJUERxDqzMptP3P5EDqt8NnCu4UWe9stXzjAFj/9HSl3d3kWGTd1WUBA+HDb2YuMGEIXHWtd2pe3jojMZCBQCpCV/myd3rg/Exl98iyhmjrn9NuozAArZ9M/4lSUfKuemXbRhnWzpLlQVeI3x1zwTvBUXfc8xmrJLFFocvw5LITIWIfJ0s4QVY/O/OJ4CNOxPhyVjT1I+Bz1Rst1hKc8A7fthakINTYqD14vZupknkNPPdWb7QMgYaus2YwtgSwCTgcY1IiNpBqJCSRK+jLx0uCiMYVpw/jD2+ROJmycc6S9Tyqr/5Cuwd9XLcT80im+UByDPECxH3rAp+Qu4psuk+DDKIOZE0WQV9N1/ml6F+sqqVjE1tu6K83ulNL5YbcEthks5Rfh39RyXaQq72FyaB0aGt70/f9oOPPBRTT5ltHikdDcQp+Z8LJSv0MmpMDfJ3/3w5MVhA6tHM0+syO9wcZISEQVUrqPM/x/yIv7GLw516j7W14hUyd6ruYhCoESU+mmdMlqmuTKGzRUFgQKBSK4b6mtci9EzZFD+wdAAurohNdUq3rGTaQKxoOcggafDnx5JpHqKa8JZFOcDBdewyc2UG6al8+yybJmiazz8BmpI3YIssaxbQyjJfMqoh1/HQx0GjwZOK86wVn6oOdKNO493bEsaRZUnfdwtBCjV+wOdWnH24umdXlXtMiTyk+Ns93XshGvREsOcOJJ8ajxD/49OO/7tYMH3LAJ0yxEgnb/0cyWmOPlngSmqF0pstFU0Gy9MwAPpGk/b0WnR9m2xWtQLJ4SfiO0mHkEo3TvWTfxdXr7an0CLkG8wkErfEZh/FjgQXIVhU67xtVOkP6OT/Sb6T+HIcRBaTVjtuLA1VGUa7qKfig+2Y/tzkam9XKgzywfPkZw+alHjkUou/6l2GFiOgSN5Kx1arGtHhO4neL2VT13xPRqN4j6WcS0wUTIZB1I2XlrxOuNIX4IsowbS+HTYKUAgM5/X0CB/2vyXfSAUYsrNUXdij9ZYMUs2+Jk0+gwo2AaBxq0LQebaoq1ioUaqT+8ld8tplDzhUzGZYm3KDp4rd9hp98WRlYz+Hf5ruIla/mEs0WIXb8A1W1sjHxiSwyevdj5af90iRFvUnYwFB8wyIM/E5HU8rJvUyXHwl4ENHrfIpztR1hOOuBExpsbg9SUlkW9IrMOIC350Q9yOX8F80bFGbRJU=,iv:/WQpWvaztRIo1sNyJK+owNJ+l2/sLt1eR/hw3TL7gDM=,tag:ikIVdlgHg9plfcgVunlcIA==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -24,8 +24,8 @@ sops:
             SFRuTGtCQWY0Si9ndlYyVTBlZUhlVGsK+xw1uyjf72JxqvYaA+eJXycGqm62J9kh
             WVkbwEFE3Z27N/xVgKw4kTFO/ZqrAx9dsF2gPB2wSERJ5ndzR5mzsA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-12-17T03:32:29Z"
-    mac: ENC[AES256_GCM,data:TTaw6wv7cidgcB7c2igUPo6urQ87d0btr5puTr9yA8ppJ0iTKdLQT2nIZI0OHnP/cFE/at0YrhDNNk5AL1y9fuATRWveu1Y2KmjlYNXLlZS4PdAr3rsUs3FqSECdTqXR8ZYGodA5mOSjzWu1eYuoubVk2wtXV0alMUY7bwrnr6E=,iv:1zslrT0FX6SIEIRHPloLa2Fy8pVJVqMDIghR46l5+xg=,tag:qpw9iQAetUIoqvDQzufh8w==,type:str]
+    lastmodified: "2024-12-27T00:29:50Z"
+    mac: ENC[AES256_GCM,data:OdFzyPSxUv+nKUC3OFfcvDuP/z6z/94O9nTRoBiEhsjKK30JhjuPSZL/N3AiWM0gEhqLBcvZgWpalKEc5dOJVQTOAm7Koz7aMK8Oi2OxCFeChKnIHnyTL3i194IbcjBzIV0TcU97WRNS1N5+8hSXLsBdStd+XiwCAspOQf8y1uc=,iv:FDoyspPtWf/a47Z6KXT+d71eLRWs0bzBc47rGrAqzx4=,tag:S51hhNAg5ojCCvkHpKIo2g==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.2