From fa756b2441a46ddfd6f15f932fb2ffb24ad009fa Mon Sep 17 00:00:00 2001
From: Illia Chub <illia.chub@iceinc.solutions>
Date: Fri, 17 Dec 2021 07:16:18 +0200
Subject: [PATCH] Resolved files.nix conflicts

---
 files.nix | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/files.nix b/files.nix
index bacf1bd..3d935c1 100644
--- a/files.nix
+++ b/files.nix
@@ -14,7 +14,7 @@ in
         CLOUDFLARE_DNS_API_TOKEN=${cfg.cloudflare.apiKey}
         CLOUDFLARE_ZONE_API_TOKEN=${cfg.cloudflare.apiKey}
       '';
-      rcloneConfiguration = builtins.replaceStrings [ "\n" "\"" "\\" ] [ "\\n" "\\\"" "\\\\" ] ''
+      rcloneConfig = builtins.replaceStrings [ "\n" "\"" "\\" ] [ "\\n" "\\\"" "\\\\" ] ''
         [backblaze]
         type = b2
         account = ${cfg.backblaze.accountId}
@@ -22,18 +22,16 @@ in
       '';
     in
     [
-      "d /var/restic 0660 restic - - -"
-      "d /var/bitwarden 0777 bitwarden_rs bitwarden_rs -"
-      "d /var/bitwarden/backup 0777 bitwarden_rs bitwarden_rs -"
-      "d /var/lib/pleroma 0600 pleroma pleroma - -"
-      "d /var/lib/restic 0600 restic restic - -"
-      "f /var/lib/restic/pass 0400 restic restic - ${resticPassword}"
-      "f /var/lib/pleroma/secrets.exs 0755 pleroma pleroma - -"
-      "f /var/domain 0444 selfprivacy-api selfprivacy-api - ${domain}"
-      "f /var/restic/restic-repo-password 0660 restic - - ${resticPass}"
-      "f /var/nextcloud-db-pass 0440 nextcloud nextcloud - ${nextcloudDBPass}"
-      "f /var/nextcloud-admin-pass 0440 nextcloud nextcloud - ${nextcloudAdminPass}"
-      "f /var/cloudflareCredentials.ini 0440 nginx acmerecievers - ${cloudflareCredentials}"
-      "f /root/.config/rclone/rclone.conf 0666 selfprivacy-api selfprivacy-api - ${rcloneConfiguration}"
-    ];
-}
+      (if cfg.bitwarden.enable then "d /var/lib/bitwarden 0777 bitwarden_rs bitwarden_rs -" else "")
+      (if cfg.bitwarden.enable then "d /var/lib/bitwarden/backup 0777 bitwarden_rs bitwarden_rs -" else "")
+      (if cfg.pleroma.enable then "d /var/lib/pleroma 0600 pleroma pleroma - -" else "")
+      "d /var/lib/restic 0600 restic - - -"
+      "f+ /var/lib/restic/pass 0400 restic - - ${resticPass}"
+      "f+ /root/.config/rclone/rclone.conf 0400 root root - ${rcloneConfig}"
+      (if cfg.pleroma.enable then "f+ /var/lib/pleroma/secrets.exs 0755 pleroma pleroma - -" else "")
+      "f+ /var/domain 0444 selfprivacy-api selfprivacy-api - ${domain}"
+      (if cfg.nextcloud.enable then "f+ /var/lib/nextcloud/db-pass 0440 nextcloud nextcloud - ${nextcloudDBPass}" else "")
+      (if cfg.nextcloud.enable then "f+ /var/lib/nextcloud/admin-pass 0440 nextcloud nextcloud - ${nextcloudAdminPass}" else "")
+      "f+ /var/lib/cloudflare/Credentials.ini 0440 nginx acmerecievers - ${cloudflareCredentials}"
+    ]
+}
\ No newline at end of file