diff --git a/nixos/configs/syncthing.nix b/nixos/configs/syncthing.nix
index e7ecc1c..34cd3f0 100644
--- a/nixos/configs/syncthing.nix
+++ b/nixos/configs/syncthing.nix
@@ -8,8 +8,8 @@ let
     "valere"      = { id = "VLZYF6C-OHG66RM-O72IMW3-S35YWAV-TYFJJVU-KAMJR7G-2XRLCVB-XOY6IAG"; };
     "design"      = { id = "XLTC5OX-3ZU6CYZ-MJ7TAY7-ZAMRIE4-SS2JWFB-FC3RJIO-B3BIQFV-J7U53QK"; };
     "trailblazer" = { id = "JASHWW7-AYYTQLN-QZ6OEOX-EZK4GPA-OYW5IZS-5KAIIVR-MMXMCHL-OERDBQ2"; };
+    "aigis"       = { id = "VKRQ6Q4-CCLJR2I-ECOWXRE-TANA2QZ-BJIAPCN-FFVJSB4-GYJNS4R-Z3LLHQ5"; };
   };
-
 in
 {
 	services.syncthing = {
@@ -43,10 +43,22 @@ in
 		};
 	};
 
+	# Quick setup to make syncthing work from its first start.
+	systemd.services.syncthing-setup = {
+		requires = [ "network.target"];
+		script = ''
+			mkdir -p /var/lib/syncthing
+			chown -R deprekated: /var/lib/syncthing
+		'';
+	};
 
 	# Extra config passed through the environment.
-  systemd.services.syncthing.environment = {
-    STNODEFAULTFOLDER = "true";
+  systemd.services.syncthing = {
+    requires = [ "syncthing-setup.service"];
+    after = [ "syncthing-setup.service"];
+
+    # Use our specified folders only; don't create an implicit one.
+    environment.STNODEFAULTFOLDER = "true";
   };
 
 }