diff --git a/modules/datasync.nix b/modules/datasync.nix
index 73bec27..0478d96 100644
--- a/modules/datasync.nix
+++ b/modules/datasync.nix
@@ -17,67 +17,69 @@
     user = "coolneng";
     dataDir = "/home/coolneng";
     key = config.age.secrets.syncthing.path;
-    devices.zion = {
-      id = "FLI2RS7-GNI5PDM-SQRNF7P-YJIOXJ7-46FRPEI-NRLQGBC-HXRWG7O-RKOVLAF";
-      addresses = [ "tcp://192.168.13.2:22000" ];
-    };
-    folders = {
-      Documents = {
-        id = "wusdj-bfjkr";
-        path = "/home/coolneng/Documents";
-        devices = [ "zion" ];
-        versioning = {
-          type = "simple";
-          params.keep = "5";
+    settings = {
+      devices.zion = {
+        id = "FLI2RS7-GNI5PDM-SQRNF7P-YJIOXJ7-46FRPEI-NRLQGBC-HXRWG7O-RKOVLAF";
+        addresses = [ "tcp://192.168.13.2:22000" ];
+      };
+      folders = {
+        Documents = {
+          id = "wusdj-bfjkr";
+          path = "/home/coolneng/Documents";
+          devices = [ "zion" ];
+          versioning = {
+            type = "simple";
+            params.keep = "5";
+          };
         };
-      };
 
-      Notes = {
-        id = "kafhz-bfmzm";
-        path = "/home/coolneng/Notes";
-        devices = [ "zion" ];
-        versioning = {
-          type = "simple";
-          params.keep = "5";
+        Notes = {
+          id = "kafhz-bfmzm";
+          path = "/home/coolneng/Notes";
+          devices = [ "zion" ];
+          versioning = {
+            type = "simple";
+            params.keep = "5";
+          };
         };
-      };
 
-      Music = {
-        id = "2aqt7-vpprc";
-        path = "/home/coolneng/Music";
-        devices = [ "zion" ];
-      };
+        Music = {
+          id = "2aqt7-vpprc";
+          path = "/home/coolneng/Music";
+          devices = [ "zion" ];
+        };
 
-      Photos = {
-        id = "mjibc-ustcg";
-        path = "/home/coolneng/Photos";
-        devices = [ "zion" ];
-      };
+        Photos = {
+          id = "mjibc-ustcg";
+          path = "/home/coolneng/Photos";
+          devices = [ "zion" ];
+        };
 
-      Projects = {
-        id = "cjhmu-avy9v";
-        path = "/home/coolneng/Projects";
-        devices = [ "zion" ];
-      };
+        Projects = {
+          id = "cjhmu-avy9v";
+          path = "/home/coolneng/Projects";
+          devices = [ "zion" ];
+        };
 
-      Phone = {
-        id = "m2007j20cg_vc7r-photos";
-        type = "receiveonly";
-        path = "/home/coolneng/Photos/Phone";
-        devices = [ "zion" ];
-      };
+        Phone = {
+          id = "m2007j20cg_vc7r-photos";
+          type = "receiveonly";
+          path = "/home/coolneng/Photos/Phone";
+          devices = [ "zion" ];
+        };
 
-      Phone-screenshots = {
-        id = "pp70r-pbr70";
-        type = "receiveonly";
-        path = "/home/coolneng/Photos/Phone-screenshots";
-        devices = [ "zion" ];
-      };
+        Phone-screenshots = {
+          id = "pp70r-pbr70";
+          type = "receiveonly";
+          path = "/home/coolneng/Photos/Phone-screenshots";
+          devices = [ "zion" ];
+        };
 
-      Files = {
-        id = "tsk52-u6rbk";
-        path = "/home/coolneng/Files";
-        devices = [ "zion" ];
+        Files = {
+          id = "tsk52-u6rbk";
+          path = "/home/coolneng/Files";
+          devices = [ "zion" ];
+        };
       };
     };
   };
diff --git a/modules/software.nix b/modules/software.nix
index 9d3ceb5..04467fb 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -114,7 +114,7 @@ in {
   ];
 
   # Fonts declaration
-  fonts.fonts = with pkgs; [
+  fonts.packages = with pkgs; [
     google-fonts
     inconsolata-nerdfont
     terminus_font_ttf