From a2a896e2fe3a34c9404d3ea81fd7e5b94b02e695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Sat, 24 May 2025 22:20:58 +0300
Subject: [PATCH] vno3-nk: onboard to main syncthing module

---
 data.nix                               |  2 --
 hosts/vno3-nk/configuration.nix        |  9 +++++++++
 modules/services/jakstpub/default.nix  | 25 ++-----------------------
 modules/services/syncthing/default.nix | 17 ++++++++++++++---
 4 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/data.nix b/data.nix
index 7dea47e..326a4c1 100644
--- a/data.nix
+++ b/data.nix
@@ -87,7 +87,6 @@ rec {
       ];
     };
     "vno1-gdrx.jakst.vpn" = rec {
-      syncthingID = "XOZO6GL-MEH55QR-PTNRVHE-45PD3L2-SHP7XW6-VXKROQ5-F47U3AX-QQACLQP";
       extraHostNames = [
         "vno1-gdrx"
         vno1IP
@@ -116,7 +115,6 @@ rec {
     };
     "mtworx.jakst.vpn" = rec {
       extraHostNames = [ "mtworx" ];
-      syncthingID = "C72YA2S-PE5IGDZ-DCNFV7Y-I72BGZM-5L2OO7Y-4K5OTGZ-NILAS2V-BGSAUQW";
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK/2oa3/NDV7GQNAKEQdJ+LZMwK0TUr1wChJMkZM1I3b";
     };
     "vno1-vinc.jakst.vpn" = rec {
diff --git a/hosts/vno3-nk/configuration.nix b/hosts/vno3-nk/configuration.nix
index afea37a..9cd135a 100644
--- a/hosts/vno3-nk/configuration.nix
+++ b/hosts/vno3-nk/configuration.nix
@@ -19,6 +19,8 @@ in
     sasl-passwd.file = ../../secrets/postfix_sasl_passwd.age;
     borgbackup-password.file = ../../secrets/fwminex/borgbackup-password.age;
     timelapse.file = ../../secrets/timelapse.age;
+    syncthing-key.file = ../../secrets/vno3-nk/syncthing/key.pem.age;
+    syncthing-cert.file = ../../secrets/vno3-nk/syncthing/cert.pem.age;
     ssh8022-server = {
       file = ../../secrets/ssh8022.age;
       owner = "spiped";
@@ -221,6 +223,13 @@ in
         hostname = "hdd.jakstys.lt";
       };
 
+      syncthing = {
+        enable = true;
+        dataDir = "/var/lib/jakstpub/";
+        user = "jakstpub";
+        group = "jakstpub";
+      };
+
     };
   };
 
diff --git a/modules/services/jakstpub/default.nix b/modules/services/jakstpub/default.nix
index 505ebb2..623e867 100644
--- a/modules/services/jakstpub/default.nix
+++ b/modules/services/jakstpub/default.nix
@@ -75,36 +75,15 @@ in
         inherit (cfg) hostname;
       };
 
-      syncthing = {
-        enable = false;
-        user = "jakstpub";
-        group = "jakstpub";
-        dataDir = "/data/vno3-shared";
-        devices = {
-          vno1-gdrx.id = myData.hosts."vno1-gdrx.jakst.vpn".syncthingID;
-          mtworx.id = myData.hosts."mtworx.jakst.vpn".syncthingID;
-          jonas-laptop.id = "6VP6TYU-SEQFCSO-ODDY7P7-72MNW3W-YXFNWJQ-JXNLVZQ-HRGCOJX-WZZZVQI";
-        };
-        folders = {
-          "/data/vno3-shared/Zemelapiai" = {
-            id = "ahz8ohSh";
-            devices = [
-              "vno1-gdrx"
-              "mtworx"
-              "jonas-laptop"
-            ];
-          };
-        };
-      };
     };
 
     users.users.jakstpub = {
       description = "Jakstys Public";
-      home = "/var/empty";
+      home = "/var/lib/jakstpub";
       shell = "/bin/sh";
       group = "jakstpub";
       isSystemUser = true;
-      createHome = false;
+      createHome = true;
       uid = cfg.uidgid;
     };
 
diff --git a/modules/services/syncthing/default.nix b/modules/services/syncthing/default.nix
index 7002c59..cc64679 100644
--- a/modules/services/syncthing/default.nix
+++ b/modules/services/syncthing/default.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  myData,
   ...
 }:
 let
@@ -9,13 +8,13 @@ let
 
   devices = {
     "fwminex".id = "GKSUKZE-AOBQOWY-CNLZ2ZI-WNKATYE-MV4Y452-J3VCJ5C-EAANXRX-2P6EHA6";
-    "mtworx".id = myData.hosts."mtworx.jakst.vpn".syncthingID;
+    "mtworx".id = "C72YA2S-PE5IGDZ-DCNFV7Y-I72BGZM-5L2OO7Y-4K5OTGZ-NILAS2V-BGSAUQW";
     "mxp1".id = "2HBV27D-PK5DKQG-EQE4AV7-ASADXHJ-ER7GAZK-Z6C2NZP-64DLTKI-5OPUZAT";
     "vxp10".id = "CNAGBWH-3EAJ3XR-Z6K2DTW-P42O4SD-7JVCOEL-KIM7BKW-2WA7XS3-733NIQF";
     "rzj-744P2PE".id = "UW6ISH2-NW6X6AW-BJR76TV-TV3BIGZ-PA5QH2M-YEF567T-IWMHKD5-P3XHHAH";
     "sqq1-desk".id = "WJ5KGRS-AGDZ7SW-INIVWHR-Q4E5QX4-Y4TT2AK-QRJTOTL-2UHXX6O-5MUPGA2";
     "vno1-vinc".id = "4W3S7R2-OWI6XO6-V4NMDNB-NTIETYP-QJSBQGA-WEIXPHR-WNZZ7R4-VT4COAR";
-    "vno1-gdrx".id = myData.hosts."vno1-gdrx.jakst.vpn".syncthingID;
+    "vno1-gdrx".id = "XOZO6GL-MEH55QR-PTNRVHE-45PD3L2-SHP7XW6-VXKROQ5-F47U3AX-QQACLQP";
     "vno2-irena".id = "VL2MA2E-ZDGVHYN-A3Q3EKU-7J625QM-FG7CNXY-UKDL563-MDRRIEG-XQDS3AW";
     "vno3-nk".id = "HDESTGW-C3PGZLU-7V7KLWP-SIJVM3V-JEG6OMT-CGOLOQW-DZMIPS7-G7SVSQB";
     "v-kfire".id = "REEDZAL-KPLWARZ-466J4BR-H5UDI6D-UUA33QG-HPZHIMX-WNFLDGD-PJLTFQZ";
@@ -225,6 +224,15 @@ in
               jonas-laptop
               ;
           })
+          // (lib.optionalAttrs (config.networking.hostName == "vno3-nk") {
+            inherit (devices)
+              vno3-nk
+              vno1-gdrx
+              fwminex
+              mtworx
+              jonas-laptop
+              ;
+          })
           // (lib.optionalAttrs (config.networking.hostName == "fwminex") {
             inherit (devices)
               vno1-gdrx
@@ -279,6 +287,9 @@ in
             "${cfg.dataDir}/music" = Music;
             "${cfg.dataDir}/irenos" = Irenos;
           })
+          // (lib.optionalAttrs (config.networking.hostName == "vno3-nk") {
+            "/data/vno3-shared/Zemelapiai" = Zemelapiai;
+          })
           // (lib.optionalAttrs (config.networking.hostName == "mtworx") {
             "${cfg.dataDir}/M-Active" = M-Active;
             "${cfg.dataDir}/M-Camera" = M-Camera;