From dd0dbbd29fa189f9d561e1989ddf334111971bfb Mon Sep 17 00:00:00 2001
From: DavHau <d.hauer.it@gmail.com>
Date: Tue, 2 Apr 2024 17:55:49 +0700
Subject: [PATCH] syncthing: fix conflicting definition of
 fs.inotify.max_user_watches

---
 clanModules/syncthing.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/clanModules/syncthing.nix b/clanModules/syncthing.nix
index 09b24abc..a5bd2d97 100644
--- a/clanModules/syncthing.nix
+++ b/clanModules/syncthing.nix
@@ -65,7 +65,9 @@
       ];
 
       # Activates inotify compatibility on syncthing
-      boot.kernel.sysctl."fs.inotify.max_user_watches" = lib.mkDefault 524288;
+      # use mkOverride 900 here as it otherwise would collide with the default of the
+      # upstream nixos xserver.nix
+      boot.kernel.sysctl."fs.inotify.max_user_watches" = lib.mkOverride 900 524288;
 
       services.syncthing = {
         enable = true;