Skip to content

Commit

Permalink
formatting according to HM's format tool
Browse files Browse the repository at this point in the history
  • Loading branch information
pitkling committed Nov 19, 2024
1 parent e091fe3 commit 2d676db
Showing 1 changed file with 14 additions and 15 deletions.
29 changes: 14 additions & 15 deletions modules/services/syncthing.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ let

# syncthing's configuration directory (see https://docs.syncthing.net/users/config.html)
syncthing_dir = if pkgs.stdenv.isDarwin then
"$HOME/Library/Application Support/Syncthing"
else
"\${XDG_STATE_HOME:-$HOME/.local/state}/syncthing";
"$HOME/Library/Application Support/Syncthing"
else
"\${XDG_STATE_HOME:-$HOME/.local/state}/syncthing";

# Syncthing supports serving the GUI over Unix sockets. If that happens, the
# API is served over the Unix socket as well. This function returns the correct
Expand Down Expand Up @@ -56,14 +56,10 @@ let
copyKeys = pkgs.writers.writeBash "syncthing-copy-keys" ''
${install} -dm700 "${syncthing_dir}"
${optionalString (cfg.cert != null) ''
${install} -Dm400 ${
toString cfg.cert
} "${syncthing_dir}/cert.pem"
${install} -Dm400 ${toString cfg.cert} "${syncthing_dir}/cert.pem"
''}
${optionalString (cfg.key != null) ''
${install} -Dm400 ${
toString cfg.key
} "${syncthing_dir}/key.pem"
${install} -Dm400 ${toString cfg.key} "${syncthing_dir}/key.pem"
''}
'';

Expand Down Expand Up @@ -646,7 +642,8 @@ in {
};

Service = {
ExecStartPre = mkIf (cfg.cert != null || cfg.key != null) "+${copyKeys}";
ExecStartPre =
mkIf (cfg.cert != null || cfg.key != null) "+${copyKeys}";
ExecStart = escapeShellArgs syncthingArgs;
Restart = "on-failure";
SuccessExitStatus = [ 3 4 ];
Expand Down Expand Up @@ -692,13 +689,13 @@ in {
syncthing = {
enable = true;
config = {
ProgramArguments = [ "${
pkgs.writers.writeBash "syncthing-wrapper" ''
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 = {
Crashed = true;
SuccessfulExit = false;
Expand All @@ -711,7 +708,9 @@ in {
enable = true;
config = {
ProgramArguments = [ "${updateConfig}" ];
WatchPaths = [ "${config.home.homeDirectory}/Library/Application Support/Syncthing/${watch_file}" ];
WatchPaths = [
"${config.home.homeDirectory}/Library/Application Support/Syncthing/${watch_file}"
];
};
};
};
Expand Down

0 comments on commit 2d676db

Please sign in to comment.