aires/nix-configuration
aires/nix-configuration
1
0
Fork 0
Code Actions Activity

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

Browse source
This commit is contained in:
Aires 2024-11-24 13:38:58 -05:00
parent 7cff2e17d0
commit 3feefc4b70
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/services/syncthing.nix
View file

@ -7,7 +7,8 @@ in
{ {
options = { options = {
aux.system.services.syncthing = { 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 { home = lib.mkOption {
default = "/var/lib/syncthing"; default = "/var/lib/syncthing";
type = lib.types.str; type = lib.types.str;
@ -34,7 +35,12 @@ in
# If the web UI is public, open the port in the firewall # If the web UI is public, open the port in the firewall
networking.firewall.allowedTCPPorts = with cfg.web; lib.mkIf (enable && public) [ port ]; 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; enable = true;
user = cfg.user; user = cfg.user;
group = config.users.users.${cfg.user}.group; group = config.users.users.${cfg.user}.group;
@ -45,6 +51,7 @@ in
in in
"${listenAddress}:${builtins.toString cfg.web.port}"; "${listenAddress}:${builtins.toString cfg.web.port}";
}; };
};
systemd.services.syncthing = { systemd.services.syncthing = {
environment.STNODEFAULTFOLDER = "true"; # Don't create default ~/Sync folder environment.STNODEFAULTFOLDER = "true"; # Don't create default ~/Sync folder

1
modules/ui/desktops/gnome.nix
View file

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