SebastianStork/nixos-config
1
0
Fork 0
mirror of https://github.com/SebastianStork/nixos-config.git synced 2026-01-21 15:11:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

syncthing: Connect devices over nebula instead of tailscale

Browse source
This commit is contained in:
SebastianStork 2026-01-10 01:32:23 +01:00
parent bd196f1f27
commit 653ebd2c85
Signed by: SebastianStork
SSH key fingerprint: SHA256:tRrGdjYOwgHxpSc/wTOZQZEjxcb15P0tyXRsbAfd+2Q
1 changed files with 49 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

25
modules/system/services/syncthing.nix
View file

@ -51,8 +51,8 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
assertions = [ assertions = [
{ {
assertion = config.custom.services.tailscale.enable; assertion = config.custom.services.nebula.node.enable;
message = "Syncthing requires tailscale"; message = "Syncthing requires nebula";
} }
{ {
assertion = cfg.isServer -> (cfg.gui.domain != null); assertion = cfg.isServer -> (cfg.gui.domain != null);
@ -86,7 +86,8 @@ in
}; };
}; };
services.syncthing = { services = {
syncthing = {
enable = true; enable = true;
user = lib.mkIf (!cfg.isServer) "seb"; user = lib.mkIf (!cfg.isServer) "seb";
@ -105,9 +106,11 @@ in
|> lib.filterAttrs (name: _: name != config.networking.hostName) |> lib.filterAttrs (name: _: name != config.networking.hostName)
|> lib.filterAttrs (_: value: value.config.custom.services.syncthing.enable) |> lib.filterAttrs (_: value: value.config.custom.services.syncthing.enable)
|> lib.mapAttrs ( |> lib.mapAttrs (
name: value: { _: value: {
id = value.config.custom.services.syncthing.deviceId; id = value.config.custom.services.syncthing.deviceId;
addresses = [ "tcp://${name}.${config.custom.services.tailscale.domain}:${toString cfg.syncPort}" ]; addresses = [
"tcp://${value.config.custom.services.nebula.node.address}:${toString cfg.syncPort}"
];
} }
); );
@ -119,7 +122,7 @@ in
}); });
options = { options = {
listenAddress = "tcp://0.0.0.0:${toString cfg.syncPort}"; listenAddress = "tcp://${config.custom.services.nebula.node.address}:${toString cfg.syncPort}";
globalAnnounceEnabled = false; globalAnnounceEnabled = false;
localAnnounceEnabled = false; localAnnounceEnabled = false;
relaysEnabled = false; relaysEnabled = false;
@ -130,6 +133,16 @@ in
}; };
}; };
nebula.networks.mesh.firewall.inbound =
config.services.syncthing.settings.devices
|> lib.attrNames
|> lib.map (name: {
port = cfg.syncPort;
proto = "tcp";
host = name;
});
};
custom = { custom = {
services = { services = {
caddy.virtualHosts.${cfg.gui.domain}.port = lib.mkIf (cfg.gui.domain != null) cfg.gui.port; caddy.virtualHosts.${cfg.gui.domain}.port = lib.mkIf (cfg.gui.domain != null) cfg.gui.port;