diff --git a/machines/fischer/default.nix b/machines/fischer/default.nix
index 693f3fe..5e31427 100644
--- a/machines/fischer/default.nix
+++ b/machines/fischer/default.nix
@@ -9,6 +9,7 @@
   imports = [
     ./hardware.nix
     ./home-julien.nix
+    ./syncthing.nix
   ];
 
   machine.meta = {
@@ -86,9 +87,9 @@
 
     # Use the NVidia open source kernel module (not to be confused with the
     # independent third-party "nouveau" open source driver).
-    # Support is limited to the Turing and later architectures. Full list of 
-    # supported GPUs is at: 
-    # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus 
+    # Support is limited to the Turing and later architectures. Full list of
+    # supported GPUs is at:
+    # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
     # Only available from driver 515.43.04+
     # Do not disable this unless your GPU is unsupported or if you have a good reason to.
     open = true;
diff --git a/machines/fischer/syncthing.nix b/machines/fischer/syncthing.nix
new file mode 100644
index 0000000..5177bb6
--- /dev/null
+++ b/machines/fischer/syncthing.nix
@@ -0,0 +1,44 @@
+{ config, ... }:
+{
+  services.syncthing = {
+    enable = true;
+    user = "julien";
+    group = "users";
+    overrideDevices = true;
+    overrideFolders = true;
+
+    settings.options = {
+      urAccepted = -1;
+      listenAddresses = [ "tcp://${config.machine.meta.ips.vpn.ipv4}" ];
+    };
+
+    devices = {
+      "gustave" = {
+        id = "6APF3EP-TIV7ZBK-5WB5SA4-Y2K37CR-AMIB2TM-6T2VORK-UYNQO2X-TO6V2QH";
+        addresses = [
+          "tcp://gustave.luj:22000"
+        ];
+      };
+
+      "gallifrey" = {
+        id = "P3BTFAX-4MCSFQB-C5R5YBP-YGMJ6FU-OKJN4QG-MJ2BV6Y-YB4U7VL-3GFSTAM";
+        addresses = [
+          "tcp://gallifrey.luj:22000"
+        ];
+      };
+
+    };
+    folders = {
+      "dev" = {
+        path = "/home/julien/dev";
+        devices = [
+          "gustave"
+          "gallifrey"
+        ];
+      };
+    };
+  };
+
+  systemd.services.syncthing.serviceConfig.StateDirectory = "syncthing";
+  systemd.services.syncthing.environment.STNODEFAULTFOLDER = "true";
+}