diff --git a/nix/london/configuration.nix b/nix/london/configuration.nix index e442104..e5f5fe6 100644 --- a/nix/london/configuration.nix +++ b/nix/london/configuration.nix @@ -1,4 +1,24 @@ { config, pkgs, ... }: +let + + syncthingLatest = + let + version = "1.24.0"; + src = pkgs.fetchFromGitHub { + owner = "syncthing"; + repo = "syncthing"; + rev = "v1.24.0"; + hash = "sha256-5vr9qWMHBYpu8wHpV1JZcX1kEPi+mYeZ7ZQBqXASp9I="; + }; + in + (pkgs.syncthing.override rec { + buildGoModule = args: pkgs.buildGoModule.override {} (args // { + inherit src version; + vendorHash = "sha256-BZwZ6npmWFU0lvynjRZOBOhtxqic0djoSUdCOLbUwjE="; + }); + }); + +in { imports = [ @@ -70,6 +90,16 @@ i18n.defaultLocale = "en_GB.utf8"; services = { + syncthing = { + enable = true; + overrideDevices = false; + overrideFolders = false; + user = "gsimmer"; + dataDir = "/home/gsimmer"; + guiAddress = "100.95.77.62:8384"; + package = syncthingLatest; + }; + usbmuxd.enable = true; prometheus.exporters.node = { enable = true; listenAddress = "100.95.77.62"; diff --git a/nix/nas/configuration.nix b/nix/nas/configuration.nix index f21dbd1..639b4cd 100644 --- a/nix/nas/configuration.nix +++ b/nix/nas/configuration.nix @@ -1,5 +1,22 @@ { config, pkgs, ... }: - +let + syncthingLatest = + let + version = "1.24.0"; + src = pkgs.fetchFromGitHub { + owner = "syncthing"; + repo = "syncthing"; + rev = "v1.24.0"; + hash = "sha256-5vr9qWMHBYpu8wHpV1JZcX1kEPi+mYeZ7ZQBqXASp9I="; + }; + in + (pkgs.syncthing.override rec { + buildGoModule = args: pkgs.buildGoModule.override {} (args // { + inherit src version; + vendorHash = "sha256-BZwZ6npmWFU0lvynjRZOBOhtxqic0djoSUdCOLbUwjE="; + }); + }); +in { imports = [ # Include the results of the hardware scan. @@ -77,6 +94,7 @@ user = "gsimmer"; dataDir = "/Primary/gabriel"; guiAddress = "100.116.48.47:8384"; + package = syncthingLatest; }; prometheus.exporters = { blackbox = {