diff --git a/configuration.nix b/configuration.nix
index 8504fd2..13b9986 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -79,7 +79,7 @@
     ./modules/software.nix
     ./modules/networking.nix
     ./modules/gui.nix
-    #./modules/datasync.nix
+    ./modules/datasync.nix
     ./modules/audio.nix
     ./modules/development.nix
     ./modules/hardware-configuration.nix
diff --git a/modules/datasync.nix b/modules/datasync.nix
index 36d874c..9874ddc 100644
--- a/modules/datasync.nix
+++ b/modules/datasync.nix
@@ -13,7 +13,7 @@
       "syscea/state/root" = {
         plan = "1d=>1h,1m=>1d,1y=>1m";
         recursive = true;
-        mbuffer = true;
+        mbuffer.enable = true;
         destinations.remote = {
           host = "coolneng@zion";
           dataset = "syscea/root";
@@ -23,7 +23,7 @@
       "syscea/state/home" = {
         plan = "1d=>1h,1m=>1d,1y=>1m";
         recursive = true;
-        mbuffer = true;
+        mbuffer.enable = true;
         destinations.remote = {
           host = "coolneng@zion";
           dataset = "syscea/home";
@@ -35,10 +35,14 @@
   # Syncthing configuration
   services.syncthing = {
     enable = true;
+    user = "coolneng";
     dataDir = "/home/coolneng";
     declarative = {
       devices = {
-        zion = { id = "XABIMVG-K5RKMAF-KNC33AR-TDAVEGK-GHUIVFD-NIFCX6L-6PQXRM5-KLK2PAU"; };
+        zion = {
+          id = "XABIMVG-K5RKMAF-KNC33AR-TDAVEGK-GHUIVFD-NIFCX6L-6PQXRM5-KLK2PAU";
+          addresses = ["tcp://coolneng.duckdns.org:22000"];
+        };
       };
       folders = {
         Documents = {
diff --git a/modules/software.nix b/modules/software.nix
index 07a8d06..5b199e4 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -20,6 +20,7 @@
     ripgrep
     fd
     clang
+    coreutils
     # Terminals
     tmux
     tmuxp