From e6a47f4420becf42cc04e1f49c796869dc61ba4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Mon, 18 Sep 2023 12:38:17 +0300 Subject: [PATCH] syncthing: a few more folders --- modules/services/syncthing/default.nix | 85 ++++++++++++++------------ 1 file changed, 47 insertions(+), 38 deletions(-) diff --git a/modules/services/syncthing/default.nix b/modules/services/syncthing/default.nix index f75a0ee..60c53a0 100644 --- a/modules/services/syncthing/default.nix +++ b/modules/services/syncthing/default.nix @@ -5,6 +5,14 @@ ... }: let guiPort = 8384; + cfg = config.services.syncthing; + devices = { + "fwminex".id = "GKSUKZE-AOBQOWY-CNLZ2ZI-WNKATYE-MV4Y452-J3VCJ5C-EAANXRX-2P6EHA6"; + "vno1-oh2".id = "W45ROUW-CHKI3I6-C4VCOCU-NJYQ3ZS-MJDHH23-YYCDXTI-HTJSBZJ-KZMWTAF"; + "mxp10".id = "LO54QZZ-5J3G62P-WUVM3MW-7J3VWHD-BG76TOQ-5S7PZSY-JU45K3I-X3ZL4AN"; + "rzj-744P2PE".id = "UW6ISH2-NW6X6AW-BJR76TV-TV3BIGZ-PA5QH2M-YEF567T-IWMHKD5-P3XHHAH"; + "KrekenavosNamai".id = "CYZDYL6-YMW7SZ3-K6IJO4Q-6NOULSG-OVZ3BGN-6LN3CLR-P3BJFKW-2PMHJQT"; + }; folders = { Books = { devices = ["mxp10" "fwminex" "vno1-oh2"]; @@ -16,6 +24,26 @@ id = "f6fma-unkxq"; label = "M-Active"; }; + M-Documents = { + devices = ["fwminex" "vno1-oh2"]; + id = "4fu7z-z6es2"; + label = "M-Documents"; + }; + M-Camera = { + devices = ["mxp10" "fwminex" "vno1-oh2"]; + id = "pixel_xl_dtm3-photos"; + label = "M-Active"; + }; + R-Documents = { + devices = ["rzj-744P2PE" "vno1-oh2"]; + id = "nm23h-aog6k"; + label = "R-Documents"; + }; + Pictures = { + devices = ["fwminex" "vno1-oh2"]; + id = "d3hur-cbzyw"; + label = "Pictures"; + }; }; in { @@ -51,20 +79,14 @@ in { devices = {} // (lib.optionalAttrs (config.networking.hostName == "vno1-oh2") { - "fwminex".id = "GKSUKZE-AOBQOWY-CNLZ2ZI-WNKATYE-MV4Y452-J3VCJ5C-EAANXRX-2P6EHA6"; - "mxp10".id = "LO54QZZ-5J3G62P-WUVM3MW-7J3VWHD-BG76TOQ-5S7PZSY-JU45K3I-X3ZL4AN"; - "rzj-744P2PE".id = "UW6ISH2-NW6X6AW-BJR76TV-TV3BIGZ-PA5QH2M-YEF567T-IWMHKD5-P3XHHAH"; - "KrekenavosNamai".id = "CYZDYL6-YMW7SZ3-K6IJO4Q-6NOULSG-OVZ3BGN-6LN3CLR-P3BJFKW-2PMHJQT"; + inherit (devices) fwminex vno1-oh2 mxp10 rzj-744P2PE KrekenavosNamai; }) // (lib.optionalAttrs (config.networking.hostName == "fwminex") { - "fwminex".id = "GKSUKZE-AOBQOWY-CNLZ2ZI-WNKATYE-MV4Y452-J3VCJ5C-EAANXRX-2P6EHA6"; - "vno1-oh2".id = "W45ROUW-CHKI3I6-C4VCOCU-NJYQ3ZS-MJDHH23-YYCDXTI-HTJSBZJ-KZMWTAF"; - "mxp10".id = "LO54QZZ-5J3G62P-WUVM3MW-7J3VWHD-BG76TOQ-5S7PZSY-JU45K3I-X3ZL4AN"; - "rzj-744P2PE".id = "UW6ISH2-NW6X6AW-BJR76TV-TV3BIGZ-PA5QH2M-YEF567T-IWMHKD5-P3XHHAH"; + inherit (devices) fwminex vno1-oh2 mxp10 rzj-744P2PE; }) // {}; - folders = + folders = with folders; {} // ( lib.optionalAttrs (config.networking.hostName == "vno1-oh2") { @@ -83,49 +105,33 @@ in { id = "wslmq-fyw4w"; label = "mykolo"; }; - "${config.services.syncthing.dataDir}/annex2/Books" = folders.Books; - "${config.services.syncthing.dataDir}/annex2/M-Active" = folders.M-Active; - "${config.services.syncthing.dataDir}/annex2/M-Camera" = { - devices = ["mxp10" "fwminex"]; - id = "pixel_xl_dtm3-photos"; - label = "M-Active"; - }; - "${config.services.syncthing.dataDir}/annex2/M-Documents" = { - devices = ["fwminex"]; - id = "4fu7z-z6es2"; - label = "M-Documents"; - }; - "${config.services.syncthing.dataDir}/annex2/R-Documents" = { - devices = ["rzj-744P2PE"]; - id = "nm23h-aog6k"; - label = "R-Documents"; - }; - "${config.services.syncthing.dataDir}/annex2/Pictures" = { - devices = ["fwminex"]; - id = "d3hur-cbzyw"; - label = "Pictures"; - }; - "${config.services.syncthing.dataDir}/annex2/M-R" = { + "${cfg.dataDir}/annex2/Books" = Books; + "${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" = { devices = ["fwminex" "rzj-744P2PE" "mxp10"]; id = "evgn9-ahngz"; label = "M-R"; }; - "${config.services.syncthing.dataDir}/stud-cache" = { + "${cfg.dataDir}/stud-cache" = { devices = ["fwminex"]; id = "2kq7n-jqzxj"; label = "stud-cache"; }; - "${config.services.syncthing.dataDir}/video/shared" = { + "${cfg.dataDir}/video/shared" = { devices = ["mxp10" "fwminex"]; id = "byzmw-f6zhg"; label = "video-shared"; }; - "${config.services.syncthing.dataDir}/music" = { + "${cfg.dataDir}/music" = { devices = ["fwminex" "mxp10"]; id = "tg94v-cqcwr"; label = "music"; }; - "${config.services.syncthing.dataDir}/irenos" = { + "${cfg.dataDir}/irenos" = { devices = ["KrekenavosNamai"]; id = "wuwai-qkcqj"; label = "Irenos"; @@ -134,8 +140,11 @@ in { ) // ( lib.optionalAttrs (config.networking.hostName == "fwminex") { - "/home/motiejus/Books" = folders.Books; - "/home/motiejus/M-Active" = folders.M-Active; + "${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; } ); };