From a9ec83c732d24943dd3ac4d9cbc463ebda8e5c24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Mon, 18 Sep 2023 11:55:09 +0300 Subject: [PATCH] fwminex: start syncthing --- hosts/fwminex/configuration.nix | 2 +- modules/services/syncthing/default.nix | 165 ++++++++++++++----------- 2 files changed, 93 insertions(+), 74 deletions(-) diff --git a/hosts/fwminex/configuration.nix b/hosts/fwminex/configuration.nix index 360674d..fe5be3c 100644 --- a/hosts/fwminex/configuration.nix +++ b/hosts/fwminex/configuration.nix @@ -95,7 +95,7 @@ in { }; syncthing = { - enable = false; + enable = true; dataDir = "/home/motiejus/"; user = "motiejus"; group = "users"; diff --git a/modules/services/syncthing/default.nix b/modules/services/syncthing/default.nix index eb4d7bf..e06b755 100644 --- a/modules/services/syncthing/default.nix +++ b/modules/services/syncthing/default.nix @@ -38,85 +38,104 @@ in { devices = {} // (lib.optionalAttrs (config.networking.hostName == "vno1-oh2") { - "fwmine".id = "GKSUKZE-AOBQOWY-CNLZ2ZI-WNKATYE-MV4Y452-J3VCJ5C-EAANXRX-2P6EHA6"; + "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"; }) + // (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"; + }) // {}; - folders = { - "/var/www/dl/tel" = { - devices = ["mxp10"]; - id = "gqrtz-prx9h"; - label = "www-tel"; - }; - "/var/www/dl/fwmine" = { - devices = ["fwmine"]; - id = "7z9sw-2nubh"; - label = "www-fwmine"; - }; - "/var/www/dl/mykolo" = { - devices = ["mxp10"]; - id = "wslmq-fyw4w"; - label = "mykolo"; - }; - "${config.services.syncthing.dataDir}/annex2/Books" = { - devices = ["mxp10" "fwmine"]; - id = "8lk0n-mm63y"; - label = "Books"; - }; - "${config.services.syncthing.dataDir}/annex2/M-Active" = { - devices = ["mxp10" "fwmine"]; - id = "f6fma-unkxq"; - label = "M-Active"; - }; - "${config.services.syncthing.dataDir}/annex2/M-Camera" = { - devices = ["mxp10" "fwmine"]; - id = "pixel_xl_dtm3-photos"; - label = "M-Active"; - }; - "${config.services.syncthing.dataDir}/annex2/M-Documents" = { - devices = ["fwmine"]; - 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 = ["fwmine"]; - id = "d3hur-cbzyw"; - label = "Pictures"; - }; - "${config.services.syncthing.dataDir}/annex2/M-R" = { - devices = ["fwmine" "rzj-744P2PE" "mxp10"]; - id = "evgn9-ahngz"; - label = "M-R"; - }; - "${config.services.syncthing.dataDir}/stud-cache" = { - devices = ["fwmine"]; - id = "2kq7n-jqzxj"; - label = "stud-cache"; - }; - "${config.services.syncthing.dataDir}/video/shared" = { - devices = ["mxp10" "fwmine"]; - id = "byzmw-f6zhg"; - label = "video-shared"; - }; - "${config.services.syncthing.dataDir}/music" = { - devices = ["fwmine" "mxp10"]; - id = "tg94v-cqcwr"; - label = "music"; - }; - "${config.services.syncthing.dataDir}/irenos" = { - devices = ["KrekenavosNamai"]; - id = "wuwai-qkcqj"; - label = "Irenos"; - }; - }; + folders = + {} + // ( + lib.optionalAttrs (config.networking.hostName == "vno1-oh2") { + "/var/www/dl/tel" = { + devices = ["mxp10"]; + id = "gqrtz-prx9h"; + label = "www-tel"; + }; + "/var/www/dl/fwminex" = { + devices = ["fwminex"]; + id = "7z9sw-2nubh"; + label = "www-fwminex"; + }; + "/var/www/dl/mykolo" = { + devices = ["mxp10"]; + id = "wslmq-fyw4w"; + label = "mykolo"; + }; + "${config.services.syncthing.dataDir}/annex2/Books" = { + devices = ["mxp10" "fwminex"]; + id = "8lk0n-mm63y"; + label = "Books"; + }; + "${config.services.syncthing.dataDir}/annex2/M-Active" = { + devices = ["mxp10" "fwminex"]; + id = "f6fma-unkxq"; + label = "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" = { + devices = ["fwminex" "rzj-744P2PE" "mxp10"]; + id = "evgn9-ahngz"; + label = "M-R"; + }; + "${config.services.syncthing.dataDir}/stud-cache" = { + devices = ["fwminex"]; + id = "2kq7n-jqzxj"; + label = "stud-cache"; + }; + "${config.services.syncthing.dataDir}/video/shared" = { + devices = ["mxp10" "fwminex"]; + id = "byzmw-f6zhg"; + label = "video-shared"; + }; + "${config.services.syncthing.dataDir}/music" = { + devices = ["fwminex" "mxp10"]; + id = "tg94v-cqcwr"; + label = "music"; + }; + "${config.services.syncthing.dataDir}/irenos" = { + devices = ["KrekenavosNamai"]; + id = "wuwai-qkcqj"; + label = "Irenos"; + }; + } + ) + // ( + lib.optionalAttrs (config.networking.hostName == "fwminex") { + "/home/motiejus/Books" = { + devices = ["mxp10" "vno1-oh2" "fwminex"]; + id = "gqrtz-prx9h"; + label = "Books"; + }; + } + ); }; }; }