Move syncthing options to new format

roles/common/services/syncthing.nix

@@ -5,11 +5,10 @@
 		overrideDevices = true;
 		overrideFolders = true;
 		openDefaultPorts = true;
-		extraOptions = {
+		settings = {
 			options = {
 				urAccepted = 3;
 			};
-		};
 			# Set up devices and folders common to every device
 			devices = {
 				"phone" = {
@@ -41,4 +40,5 @@
 				};
 			};
 		};
+	};
 }

roles/desktop/services/syncthing.nix

@@ -6,7 +6,7 @@
 		user = "toast";
 		group = "users";
 		dataDir = config.users.users.toast.home;
-		folders."passwords".path = "~/Documents/Passwords";
+		settings.folders."passwords".path = "~/Documents/Passwords";
 	};
 	# Allow regular users to stop syncthing
 	# https://stackoverflow.com/questions/61480914/using-policykit-to-allow-non-root-users-to-start-and-stop-a-service

roles/gaming/services/syncthing.nix

@@ -6,7 +6,7 @@
 	TODO: turn this into a module eventually
 	*/
 
-	services.syncthing.folders = {
+	services.syncthing.settings.folders = {
 		"steam-201810" = {
 			label = "Wolfenstein The New Order Saves";
 			id = "laxxf-t2wmy";

roles/school/services/syncthing.nix

@@ -1,7 +1,7 @@
 { config, ... }:
 
 {
-	services.syncthing.folders = {
+	services.syncthing.settings.folders = {
 		"school-things" = {
 			label = "School things";
 			id = "z6alc-nfoqr";

roles/server/syncthing.nix

@@ -11,7 +11,7 @@
 		key = config.age.secrets.syncthingKey.path;
 		cert = config.age.secrets.syncthingCert.path;
 		guiAddress = "0.0.0.0:8384";
-		folders = {
+		settings.folders = {
 			"passwords" = {
 				path = "${config.services.syncthing.dataDir}/passwords";
 			};