From 85509d0934ba12559c8db5a109483a03c81dbaed Mon Sep 17 00:00:00 2001
From: Sumner Evans <me@sumnerevans.com>
Date: Thu, 19 May 2022 09:22:35 -0600
Subject: [PATCH] syncthing: start tray after syncthing.service

Fixes #2963
---
 modules/services/syncthing.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index 97ad5862..c95c1c10 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -98,7 +98,11 @@ in {
           Unit = {
             Description = cfg.tray.package.pname;
             Requires = [ "tray.target" ];
-            After = [ "graphical-session-pre.target" "tray.target" ];
+            After = [
+              "graphical-session-pre.target"
+              "tray.target"
+              "syncthing.service"
+            ];
             PartOf = [ "graphical-session.target" ];
           };
 
@@ -118,7 +122,11 @@ in {
           Unit = {
             Description = "syncthingtray";
             Requires = [ "tray.target" ];
-            After = [ "graphical-session-pre.target" "tray.target" ];
+            After = [
+              "graphical-session-pre.target"
+              "tray.target"
+              "syncthing.service"
+            ];
             PartOf = [ "graphical-session.target" ];
           };