From 740046f3f0992aac06966026878fb61d420050f8 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 17 Jan 2020 04:06:44 -0500 Subject: [PATCH] Fix syncthing config Some ids were mixed up. Extra settings for various shares. --- modules/services/syncthing.nix | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix index 766ff0d2..bbc62d06 100644 --- a/modules/services/syncthing.nix +++ b/modules/services/syncthing.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: { services.syncthing = { @@ -11,31 +11,43 @@ devices = { kuro.id = "4UJSUBN-V7LCISG-6ZE7SBN-YPXM5FQ-CE7CD2U-W4KZC7O-4HUZZSW-6DXAGQQ"; shiro.id = "G4DUO25-AMQQIWS-SRZE5TJ-43CCQZJ-5ULEZBS-P2LMZZU-V5JA5CS-6X7RLQK"; - aka.id = "4UJSUBN-V7LCISG-6ZE7SBN-YPXM5FQ-CE7CD2U-W4KZC7O-4HUZZSW-6DXAGQQ"; + aka.id = "IZQ2GAC-I3QBTRT-TXBIG7Z-NT6S66Y-H64WOCO-T3AMKYZ-VGWTNCY-CTQOLQN"; ao.id = "PXKRUR4-EVTXROW-NHSEXBZ-H2NTNL7-EWOUDXF-P3AATC7-KATI37N-3YNQAQD"; # Windows machine; set up the other end yourself! - niji.id = "BOFH5JP-A3MPTJA-EGIZVWV-URHUTSJ-2ZXCAA2-XMZPPSR-GLMOQFL-ZX7DGQP"; + midori.id = "BOFH5JP-A3MPTJA-EGIZVWV-URHUTSJ-2ZXCAA2-XMZPPSR-GLMOQFL-ZX7DGQP"; }; folders = let ifEnabledDevice = devices: lib.elem config.networking.hostName devices; in { archive = rec { - devices = [ "kuro" "ao" "niji" ]; + devices = [ "kuro" "ao" "midori" ]; path = "/home/${config.my.username}/archive"; watch = false; - rescanInterval = 7200; + rescanInterval = 3600 * 6; + type = lib.mkIf (! ifEnabledDevice ["kuro"]) "recieveonly"; + enable = ifEnabledDevice devices; + }; + share = rec { + devices = [ "kuro" "shiro" "ao" "aka" "midori" ]; + path = "/home/${config.my.username}/share"; + watch = true; + rescanInterval = 3600 * 6; enable = ifEnabledDevice devices; }; projects = rec { - devices = [ "kuro" "shiro" "ao" "niji" ]; + devices = [ "kuro" "shiro" "ao" "midori" ]; path = "/home/${config.my.username}/projects"; watch = false; - rescanInterval = 7200; + rescanInterval = 3600 * 2; + type = lib.mkIf (ifEnabledDevice ["ao"]) "recieveonly"; enable = ifEnabledDevice devices; }; secrets = rec { devices = [ "kuro" "shiro" "ao" "aka" ]; path = "/home/${config.my.username}/.secrets"; + watch = true; + rescanInterval = 3600; + type = lib.mkIf (! ifEnabledDevice ["kuro" "shiro"]) "recieveonly"; enable = ifEnabledDevice devices; }; };