Merge pull request 'syncthing: fix conflicting definition of fs.inotify.max_user_watches' (#1090) from DavHau-dave into main

2024-04-02 11:00:26 +00:00 · 2024-04-02 11:00:26 +00:00 · b342e3f991
commit b342e3f991
parent 7de7e25e78 dd0dbbd29f
1 changed files with 3 additions and 1 deletions
--- 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;