diff --git a/machines/arcadia/syncthing.nix b/machines/arcadia/syncthing.nix
index c3abffc..772af12 100644
--- a/machines/arcadia/syncthing.nix
+++ b/machines/arcadia/syncthing.nix
@@ -12,7 +12,7 @@
       listenAddresses = [ "tcp://${config.machine.meta.ips.vpn.ipv4}" ];
     };
 
-    devices = {
+    settings.devices = {
       "gustave" = {
         id = "6APF3EP-TIV7ZBK-5WB5SA4-Y2K37CR-AMIB2TM-6T2VORK-UYNQO2X-TO6V2QH";
         addresses = [
@@ -28,10 +28,10 @@
       };
 
     };
-    folders = {
+    settings.folders = {
       "dev" = {
         path = "/home/julien/dev";
-        devices = [
+        settings.devices = [
           "gustave"
           "fischer"
         ];
diff --git a/machines/fischer/syncthing.nix b/machines/fischer/syncthing.nix
index b933e17..fa8d696 100644
--- a/machines/fischer/syncthing.nix
+++ b/machines/fischer/syncthing.nix
@@ -12,7 +12,7 @@
       listenAddresses = [ "tcp://${config.machine.meta.ips.vpn.ipv4}" ];
     };
 
-    devices = {
+    settings.devices = {
       "gustave" = {
         id = "6APF3EP-TIV7ZBK-5WB5SA4-Y2K37CR-AMIB2TM-6T2VORK-UYNQO2X-TO6V2QH";
         addresses = [
@@ -35,10 +35,10 @@
       };
 
     };
-    folders = {
+    settings.folders = {
       "dev" = {
         path = "/home/julien/dev";
-        devices = [
+        settings.devices = [
           "gustave"
           "gallifrey"
           "arcadia"
diff --git a/machines/gallifrey/default.nix b/machines/gallifrey/default.nix
index 6586462..6b6034d 100644
--- a/machines/gallifrey/default.nix
+++ b/machines/gallifrey/default.nix
@@ -73,10 +73,11 @@
   services.xserver = {
     enable = true;
     videoDrivers = [ "nvidia" ];
-    displayManager.gdm.enable = true;
-    desktopManager.gnome.enable = true;
   };
 
+  services.desktopManager.gnome.enable = true;
+  services.displayManager.gdm.enable = true;
+
   hardware.graphics.enable = true;
   hardware.nvidia = {
     modesetting.enable = true;
diff --git a/machines/gallifrey/syncthing.nix b/machines/gallifrey/syncthing.nix
index c3abffc..772af12 100644
--- a/machines/gallifrey/syncthing.nix
+++ b/machines/gallifrey/syncthing.nix
@@ -12,7 +12,7 @@
       listenAddresses = [ "tcp://${config.machine.meta.ips.vpn.ipv4}" ];
     };
 
-    devices = {
+    settings.devices = {
       "gustave" = {
         id = "6APF3EP-TIV7ZBK-5WB5SA4-Y2K37CR-AMIB2TM-6T2VORK-UYNQO2X-TO6V2QH";
         addresses = [
@@ -28,10 +28,10 @@
       };
 
     };
-    folders = {
+    settings.folders = {
       "dev" = {
         path = "/home/julien/dev";
-        devices = [
+        settings.devices = [
           "gustave"
           "fischer"
         ];
diff --git a/machines/gustave/nextcloud.nix b/machines/gustave/nextcloud.nix
index 06ceb88..893ca83 100644
--- a/machines/gustave/nextcloud.nix
+++ b/machines/gustave/nextcloud.nix
@@ -38,7 +38,7 @@
         bucket = "nextcloud-bucket";
         key = "GK5e980f5f3c7e2780b931ccd0";
         secretFile = config.age.secrets."nextcloud-s3-token".path;
-        autocreate = false;
+        verify_bucket_exists = false;
       };
 
     };
diff --git a/machines/gustave/syncthing.nix b/machines/gustave/syncthing.nix
index 4f6644e..8e80600 100644
--- a/machines/gustave/syncthing.nix
+++ b/machines/gustave/syncthing.nix
@@ -12,7 +12,7 @@
       listenAddresses = [ "tcp://${config.machine.meta.ips.vpn.ipv4}" ];
     };
 
-    devices = {
+    settings.devices = {
       "fischer" = {
         id = "PLIMD3Z-L4DYKDB-MY4PFTS-3RMQUNF-GFWFOBB-SELW6MB-WIQJ2LM-QAC45QQ";
         addresses = [
@@ -26,10 +26,10 @@
         ];
       };
     };
-    folders = {
+    settings.folders = {
       "dev" = {
         path = "/home/julien/dev";
-        devices = [
+        settings.devices = [
           "fischer"
           "gallifrey"
         ];