eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2025-01-08 10:09:49 +01:00
Code Issues Releases Wiki Activity

syncthing: expand declarative config to Darwin

Browse source 
This extends the recently merged PR #5616, which expanded the Synching config to allow declarative settings under Linux, such that it also works under Darwin.

Changes:
* Update the module's `syncthing` launchd agent to copy the synching key/certificate before starting syncthing, analogously to the systemd service from the above mentioned PR #5616.
* Adds an `syncthing-init`launchd agent (analogously to the systemd service `synching-init` from the above mentioned PR #5616) that updates the configuration files. Since this must be run after the syncthing service started, we use a `WatchPath` to coordinate both launchd agents.
This commit is contained in:
Peter Kling 2024-08-29 21:57:51 +02:00
parent a2289723f9
commit e091fe38a9
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
modules/services/syncthing.nix
View file

@ -202,7 +202,6 @@ in {
services.syncthing = { services.syncthing = {
enable = mkEnableOption '' enable = mkEnableOption ''
Syncthing, a self-hosted open-source alternative to Dropbox and Bittorrent Sync. Syncthing, a self-hosted open-source alternative to Dropbox and Bittorrent Sync.
Further declarative configuration options only supported on Linux devices.
''; '';
cert = mkOption { cert = mkOption {
@ -686,11 +685,20 @@ in {
}; };
}; };
launchd.agents = { launchd.agents = let
# agent `syncthing` uses `${syncthing_dir}/${watch_file}` to notify agent `syncthing-init`
watch_file = ".launchd_update_config";
in {
syncthing = { syncthing = {
enable = true; enable = true;
config = { config = {
ProgramArguments = syncthingArgs; ProgramArguments = [ "${
pkgs.writers.writeBash "syncthing-wrapper" ''
${copyKeys} # simulate systemd's `syncthing-init.Service.ExecStartPre`
touch "${syncthing_dir}/${watch_file}" # notify syncthing-init agent
exec ${lib.escapeShellArgs syncthingArgs}
''
}" ];
KeepAlive = { KeepAlive = {
Crashed = true; Crashed = true;
SuccessfulExit = false; SuccessfulExit = false;
@ -698,6 +706,14 @@ in {
ProcessType = "Background"; ProcessType = "Background";
}; };
}; };
syncthing-init = {
enable = true;
config = {
ProgramArguments = [ "${updateConfig}" ];
WatchPaths = [ "${config.home.homeDirectory}/Library/Application Support/Syncthing/${watch_file}" ];
};
};
}; };
}) })