Update syncthing expressions for new API

extraOptions -> settings
devices -> settings.devices
folders -> settings.folders
This commit is contained in:
Evie Litherland-Smith 2023-05-19 12:00:01 +01:00
parent af8b3cd935
commit ca40907095
11 changed files with 70 additions and 72 deletions

View file

@ -1 +1 @@
{"flagWords":[],"words":["Hyprland","Gitea","Nextcloud","NIXOS","NVIM","HOMEMANAGER","pkgs","nixpkgs","waybar","Dexperimental","gvfs","wezterm","bitwarden","marktext","zotero","traefik","websecure","macchiato","catppuccin"],"language":"en","version":"0.2"} {"flagWords":[],"words":["Hyprland","Gitea","Nextcloud","NIXOS","NVIM","HOMEMANAGER","pkgs","nixpkgs","waybar","Dexperimental","gvfs","wezterm","bitwarden","marktext","zotero","traefik","websecure","macchiato","catppuccin","syncthing"],"language":"en","version":"0.2"}

View file

@ -4,21 +4,21 @@
user = "elitherl"; user = "elitherl";
group = "users"; group = "users";
dataDir = "/home/elitherl"; dataDir = "/home/elitherl";
folders = { settings = {
Sync = {
path = "/home/elitherl/Sync";
label = "UKAEA";
id = "fwzht-j7hrc";
devices = ["ion"];
ignorePerms = true;
enable = true;
};
};
extraOptions = {
options = { options = {
globalAnnounceEnabled = true; globalAnnounceEnabled = true;
localAnnounceEnabled = true; localAnnounceEnabled = true;
}; };
folders = {
Sync = {
path = "/home/elitherl/Sync";
label = "UKAEA";
id = "fwzht-j7hrc";
devices = ["ion"];
ignorePerms = true;
enable = true;
};
};
}; };
}; };
} }

View file

@ -10,7 +10,7 @@
user = "xenia"; user = "xenia";
group = "users"; group = "users";
dataDir = "/mnt/secondary/syncthing"; dataDir = "/mnt/secondary/syncthing";
folders = { settings.folders = {
"Archive" = { "Archive" = {
path = "/mnt/secondary/syncthing/archive"; path = "/mnt/secondary/syncthing/archive";
devices = ["ion" "monarch" "northstar"]; devices = ["ion" "monarch" "northstar"];

View file

@ -4,7 +4,7 @@
enable = true; enable = true;
systemService = true; systemService = true;
openDefaultPorts = true; openDefaultPorts = true;
extraOptions = { settings = {
options = { options = {
globalAnnounceEnabled = lib.mkDefault false; globalAnnounceEnabled = lib.mkDefault false;
localAnnounceEnabled = lib.mkDefault true; localAnnounceEnabled = lib.mkDefault true;

View file

@ -1,3 +1,3 @@
{...}: { {...}: {
services.syncthing.devices."H0615" = {id = "VVKKUT6-DMNEJ6J-ZI2QREG-SOLG7S5-V2V6WN3-UCQH2EN-6S2XXLS-FKN6KQF";}; services.syncthing.settings.devices."H0615" = {id = "VVKKUT6-DMNEJ6J-ZI2QREG-SOLG7S5-V2V6WN3-UCQH2EN-6S2XXLS-FKN6KQF";};
} }

View file

@ -1,3 +1,3 @@
{...}: { {...}: {
services.syncthing.devices."ion" = {id = "7DD4NPH-6T2ET5A-4FCLFWW-CS6UR2W-IO5XQXC-DM5B2Q4-6X7DGU2-UKKVEAB";}; services.syncthing.settings.devices."ion" = {id = "7DD4NPH-6T2ET5A-4FCLFWW-CS6UR2W-IO5XQXC-DM5B2Q4-6X7DGU2-UKKVEAB";};
} }

View file

@ -1,3 +1,3 @@
{...}: { {...}: {
services.syncthing.devices."monarch" = {id = "CJSUZQY-67XBLEZ-VKVHQHI-BLEUZNF-G4237AV-AW44CGH-F3JDKXU-CWT3RQZ";}; services.syncthing.settings.devices."monarch" = {id = "CJSUZQY-67XBLEZ-VKVHQHI-BLEUZNF-G4237AV-AW44CGH-F3JDKXU-CWT3RQZ";};
} }

View file

@ -1,3 +1,3 @@
{...}: { {...}: {
services.syncthing.devices."northstar" = {id = "DMQZNMB-BM3SSE4-5XV2GHE-IDRNFTS-QNZSICS-6JWHUCV-O3NHMWY-2OBC2QD";}; services.syncthing.settings.devices."northstar" = {id = "DMQZNMB-BM3SSE4-5XV2GHE-IDRNFTS-QNZSICS-6JWHUCV-O3NHMWY-2OBC2QD";};
} }

View file

@ -1,3 +1,3 @@
{...}: { {...}: {
services.syncthing.devices."remarkable" = {id = "GHB6JKS-JOA3HHP-TYHB3IJ-GLV26QW-RWRZAMG-XYFGFB6-QLUHDSH-GNPZVAO";}; services.syncthing.settings.devices."remarkable" = {id = "GHB6JKS-JOA3HHP-TYHB3IJ-GLV26QW-RWRZAMG-XYFGFB6-QLUHDSH-GNPZVAO";};
} }

View file

@ -1,3 +1,3 @@
{...}: { {...}: {
services.syncthing.devices."vanguard" = {id = "YNGBLJP-TWY6Y3C-DPPYAWL-3ZQFNQH-RDPIU5T-L54UI62-FPPA3JQ-WYXBZQZ";}; services.syncthing.settings.devices."vanguard" = {id = "YNGBLJP-TWY6Y3C-DPPYAWL-3ZQFNQH-RDPIU5T-L54UI62-FPPA3JQ-WYXBZQZ";};
} }

View file

@ -1,56 +1,54 @@
{lib, ...}: { {lib, ...}: {
services.syncthing = { services.syncthing.settings.folders = {
folders = { "Archive" = {
"Archive" = { label = "Archive";
label = "Archive"; id = "hwnqy-xzcdx";
id = "hwnqy-xzcdx"; ignorePerms = true;
ignorePerms = true; enable = lib.mkDefault false;
enable = lib.mkDefault false; };
}; "Books" = {
"Books" = { label = "Books";
label = "Books"; id = "zjmxy-ycmbq";
id = "zjmxy-ycmbq"; ignorePerms = true;
ignorePerms = true; enable = lib.mkDefault false;
enable = lib.mkDefault false; };
}; "Camera" = {
"Camera" = { label = "Camera";
label = "Camera"; id = "fp4_4j7w-photos";
id = "fp4_4j7w-photos"; type = "receiveonly";
type = "receiveonly"; ignorePerms = true;
ignorePerms = true; enable = lib.mkDefault false;
enable = lib.mkDefault false; };
}; "Documents" = {
"Documents" = { label = "Documents";
label = "Documents"; id = "qc6qa-bipsd";
id = "qc6qa-bipsd"; ignorePerms = true;
ignorePerms = true; enable = lib.mkDefault false;
enable = lib.mkDefault false; };
}; "Exports" = {
"Exports" = { label = "Exports";
label = "Exports"; id = "tof2e-pdtde";
id = "tof2e-pdtde"; ignorePerms = true;
ignorePerms = true; enable = lib.mkDefault false;
enable = lib.mkDefault false; };
}; "Movies" = {
"Movies" = { label = "Movies";
label = "Movies"; id = "3f75o-4x6sq";
id = "3f75o-4x6sq"; ignorePerms = true;
ignorePerms = true; enable = lib.mkDefault false;
enable = lib.mkDefault false; };
}; "Pictures" = {
"Pictures" = { label = "Pictures";
label = "Pictures"; id = "ziuj8-rm6dn";
id = "ziuj8-rm6dn"; ignorePerms = true;
ignorePerms = true; enable = lib.mkDefault false;
enable = lib.mkDefault false; };
}; "Xochitl" = {
"Xochitl" = { label = "Xochitl";
label = "Xochitl"; id = "dkcbx-kq7hl";
id = "dkcbx-kq7hl"; type = "receiveonly";
type = "receiveonly"; ignorePerms = true;
ignorePerms = true; enable = lib.mkDefault false;
enable = lib.mkDefault false;
};
}; };
}; };
} }