From 6a54c9f69df3a4b5d42b26d59372ba0f70671165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Tue, 30 Jul 2024 22:46:29 +0300
Subject: [PATCH] fwminex: +synthing

---
 hosts/fwminex/configuration.nix        |  7 ++
 hosts/vno1-oh2/configuration.nix       | 10 +--
 modules/services/syncthing/default.nix | 99 ++++++++++----------------
 3 files changed, 48 insertions(+), 68 deletions(-)

diff --git a/hosts/fwminex/configuration.nix b/hosts/fwminex/configuration.nix
index 867b177..9fe776f 100644
--- a/hosts/fwminex/configuration.nix
+++ b/hosts/fwminex/configuration.nix
@@ -124,6 +124,13 @@ in
         ];
       };
 
+      syncthing = {
+        enable = true;
+        dataDir = "/home/motiejus/";
+        user = "motiejus";
+        group = "users";
+      };
+
       remote-builder.client =
         let
           host = myData.hosts."fra1-a.servers.jakst";
diff --git a/hosts/vno1-oh2/configuration.nix b/hosts/vno1-oh2/configuration.nix
index c304a7f..048cecc 100644
--- a/hosts/vno1-oh2/configuration.nix
+++ b/hosts/vno1-oh2/configuration.nix
@@ -135,10 +135,7 @@
           {
             mountpoint = "/home";
             repo = "zh2769@zh2769.rsync.net:${config.networking.hostName}.${config.networking.domain}-home-motiejus-annex2";
-            paths = [
-              "motiejus/annex2"
-              "motiejus/.config/syncthing"
-            ];
+            paths = [ "motiejus/annex2" ];
             backup_at = "*-*-* 02:00:00 UTC";
           }
           {
@@ -146,10 +143,7 @@
             repo = "borgstor@${
               myData.hosts."vno3-rp3b.servers.jakst".jakstIP
             }:${config.networking.hostName}.${config.networking.domain}-home-motiejus-annex2";
-            paths = [
-              "motiejus/annex2"
-              "motiejus/.config/syncthing"
-            ];
+            paths = [ "motiejus/annex2" ];
             backup_at = "*-*-* 02:00:00 UTC";
           }
         ];
diff --git a/modules/services/syncthing/default.nix b/modules/services/syncthing/default.nix
index 9178692..437ddbf 100644
--- a/modules/services/syncthing/default.nix
+++ b/modules/services/syncthing/default.nix
@@ -212,33 +212,23 @@ in
       settings = {
         devices =
           { }
-          // (lib.optionalAttrs (config.networking.hostName == "vno1-oh2") {
-            inherit (devices)
-              fwminex
-              mtworx
-              vno1-oh2
-              mxp10
-              rzj-744P2PE
-              sqq1-desk
-              vno1-vinc
-              vno2-irena
-              v-kfire
-              a-kfire
-              ;
-          })
-          // (lib.optionalAttrs (config.networking.hostName == "fwminex") {
-            inherit (devices)
-              fwminex
-              mtworx
-              vno1-oh2
-              mxp10
-              rzj-744P2PE
-              sqq1-desk
-              vno1-vinc
-              v-kfire
-              a-kfire
-              ;
-          })
+          // (lib.optionalAttrs
+            (config.networking.hostName == "vno1-oh2" || config.networking.hostName == "fwminex")
+            {
+              inherit (devices)
+                fwminex
+                mtworx
+                vno1-oh2
+                mxp10
+                rzj-744P2PE
+                sqq1-desk
+                vno1-vinc
+                vno2-irena
+                v-kfire
+                a-kfire
+                ;
+            }
+          )
           // (lib.optionalAttrs (config.networking.hostName == "mtworx") {
             inherit (devices)
               mtworx
@@ -256,25 +246,28 @@ in
         folders =
           with folders;
           { }
-          // (lib.optionalAttrs (config.networking.hostName == "vno1-oh2") {
-            "/var/www/dl/tel" = www-mxp10;
-            "/var/www/dl/fwminex" = www-fwminex;
-            "/var/www/dl/mtworx" = www-mtworx;
-            "/var/www/dl/mykolo" = mykolo;
-            "${cfg.dataDir}/annex2/Books" = Books;
-            "${cfg.dataDir}/annex2/Mail" = Mail;
-            "${cfg.dataDir}/annex2/M-Active" = M-Active;
-            "${cfg.dataDir}/annex2/M-Camera" = M-Camera;
-            "${cfg.dataDir}/annex2/M-Documents" = M-Documents;
-            "${cfg.dataDir}/annex2/R-Documents" = R-Documents;
-            "${cfg.dataDir}/annex2/Pictures" = Pictures;
-            "${cfg.dataDir}/annex2/M-R" = M-R;
-            "${cfg.dataDir}/stud-cache" = stud-cache;
-            "${cfg.dataDir}/video/shared" = video-shared;
-            "${cfg.dataDir}/video/Vaikai" = Vaikai;
-            "${cfg.dataDir}/music" = Music;
-            "${cfg.dataDir}/irenos" = Irenos;
-          })
+          // (lib.optionalAttrs
+            (config.networking.hostName == "vno1-oh2" || config.networking.hostName == "fwminex")
+            {
+              "/var/www/dl/tel" = www-mxp10;
+              "/var/www/dl/fwminex" = www-fwminex;
+              "/var/www/dl/mtworx" = www-mtworx;
+              "/var/www/dl/mykolo" = mykolo;
+              "${cfg.dataDir}/annex2/Books" = Books;
+              "${cfg.dataDir}/annex2/Mail" = Mail;
+              "${cfg.dataDir}/annex2/M-Active" = M-Active;
+              "${cfg.dataDir}/annex2/M-Camera" = M-Camera;
+              "${cfg.dataDir}/annex2/M-Documents" = M-Documents;
+              "${cfg.dataDir}/annex2/R-Documents" = R-Documents;
+              "${cfg.dataDir}/annex2/Pictures" = Pictures;
+              "${cfg.dataDir}/annex2/M-R" = M-R;
+              "${cfg.dataDir}/stud-cache" = stud-cache;
+              "${cfg.dataDir}/video/shared" = video-shared;
+              "${cfg.dataDir}/video/Vaikai" = Vaikai;
+              "${cfg.dataDir}/music" = Music;
+              "${cfg.dataDir}/irenos" = Irenos;
+            }
+          )
           // (lib.optionalAttrs (config.networking.hostName == "mtworx") {
             "${cfg.dataDir}/M-Active" = M-Active;
             "${cfg.dataDir}/M-Camera" = M-Camera;
@@ -283,20 +276,6 @@ in
             "${cfg.dataDir}/Video" = video-shared;
             "${cfg.dataDir}/music" = Music;
             "${cfg.dataDir}/www" = www-mtworx;
-          })
-          // (lib.optionalAttrs (config.networking.hostName == "fwminex") {
-            "${cfg.dataDir}/.cache/evolution" = Mail;
-            "${cfg.dataDir}/Books" = Books;
-            "${cfg.dataDir}/M-Active" = M-Active;
-            "${cfg.dataDir}/M-Documents" = M-Documents;
-            "${cfg.dataDir}/M-Camera" = M-Camera;
-            "${cfg.dataDir}/Pictures" = Pictures;
-            "${cfg.dataDir}/Music" = Music;
-            "${cfg.dataDir}/M-R" = M-R;
-            "${cfg.dataDir}/Vaikai" = Vaikai;
-            "${cfg.dataDir}/Video" = video-shared;
-            "${cfg.dataDir}/stud-cache" = stud-cache;
-            "${cfg.dataDir}/www" = www-fwminex;
           });
       };
     };