From a7408ba6dad7266689503b21e21089a63551d285 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sun, 7 Sep 2025 16:07:58 +0200
Subject: [PATCH] syncthing: Fix for syncthing v2 (#7762) (#7766)

---
 modules/services/syncthing.nix                     | 10 +++++-----
 tests/modules/services/syncthing/extra-options.nix |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index f5cdf0162..55a78b15a 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -213,11 +213,11 @@ let
 
   defaultSyncthingArgs = [
     "${syncthing}"
-    "-no-browser"
-    "-no-restart"
-    "-no-upgrade"
-    "-gui-address=${if isUnixGui then "unix://" else ""}${cfg.guiAddress}"
-    "-logflags=0"
+    "serve"
+    "--no-browser"
+    "--no-restart"
+    "--no-upgrade"
+    "--gui-address=${if isUnixGui then "unix://" else ""}${cfg.guiAddress}"
   ];
 
   syncthingArgs = defaultSyncthingArgs ++ cfg.extraOptions;
diff --git a/tests/modules/services/syncthing/extra-options.nix b/tests/modules/services/syncthing/extra-options.nix
index 712700113..5732b5776 100644
--- a/tests/modules/services/syncthing/extra-options.nix
+++ b/tests/modules/services/syncthing/extra-options.nix
@@ -19,7 +19,7 @@ lib.mkMerge [
     nmt.script = ''
       assertFileExists home-files/.config/systemd/user/syncthing.service
       assertFileContains home-files/.config/systemd/user/syncthing.service \
-      "ExecStart=@syncthing@/bin/syncthing -no-browser -no-restart -no-upgrade '-gui-address=127.0.0.1:8384' '-logflags=0' -foo '-bar \"baz\"'"
+      "ExecStart=@syncthing@/bin/syncthing serve --no-browser --no-restart --no-upgrade '--gui-address=127.0.0.1:8384' -foo '-bar \"baz\"'"
     '';
   })