Services: re-re-enable Syncthing Tray (the Gnome extension couldn't connect to the system service)

modules/services/syncthing.nix

@@ -7,7 +7,8 @@ in
 {
   options = {
     aux.system.services.syncthing = {
-      enable = lib.mkEnableOption "Enables Syncthing";
+      enable = lib.mkEnableOption "Enables Syncthing.";
+      enableTray = lib.mkEnableOption "Enables the Syncthing Tray applet.";
       home = lib.mkOption {
         default = "/var/lib/syncthing";
         type = lib.types.str;
@@ -34,7 +35,12 @@ in
     # If the web UI is public, open the port in the firewall
     networking.firewall.allowedTCPPorts = with cfg.web; lib.mkIf (enable && public) [ port ];
 
-    services.syncthing = {
+    services = {
+      flatpak.packages = lib.mkIf (config.aux.system.ui.flatpak.enable && cfg.enableTray) [
+        "io.github.martchus.syncthingtray"
+      ];
+
+      syncthing = {
         enable = true;
         user = cfg.user;
         group = config.users.users.${cfg.user}.group;
@@ -45,6 +51,7 @@ in
           in
           "${listenAddress}:${builtins.toString cfg.web.port}";
       };
+    };
 
     systemd.services.syncthing = {
       environment.STNODEFAULTFOLDER = "true"; # Don't create default ~/Sync folder

modules/ui/desktops/gnome.nix

@@ -105,7 +105,6 @@ in
         gnomeExtensions.appindicator
         gnomeExtensions.dash-to-panel
         gnomeExtensions.random-wallpaper
-        gnomeExtensions.syncthing-indicator
       ];
     };