feat: changed config module names

config/default.nix

@@ -34,7 +34,7 @@ in let
         ]
       )
       // {
-        user = lib.mkOption {
+        users = lib.mkOption {
           type = lib.types.attrsOf userSubmodule;
         };
       };
@@ -79,7 +79,7 @@ in let
           "writefreely"
         ])
       // {
-        instance = lib.mkOption {
+        instances = lib.mkOption {
           type = lib.types.attrsOf instanceSubmodule;
         };
       };
@@ -102,7 +102,7 @@ in let
       };
     };
   };
-  systemSubmodule = lib.types.submodule {
+  machineSubmodule = lib.types.submodule {
     options =
       builtins.listToAttrs (map (name: {
           inherit name;
@@ -119,7 +119,7 @@ in let
           "tablet"
         ])
       // {
-        device = lib.mkOption {
+        devices = lib.mkOption {
           type = lib.types.attrsOf deviceSubmodule;
         };
       };
@@ -146,11 +146,11 @@ in let
     };
 in {
   options = {
-    service = lib.mkOption {
+    services = lib.mkOption {
       type = serviceSubmodule;
     };
-    system = lib.mkOption {
-      type = systemSubmodule;
+    machines = lib.mkOption {
+      type = machineSubmodule;
     };
     people = lib.mkOption {
       type = peopleSubmodule;
@@ -158,8 +158,8 @@ in {
   };
 
   config = {
-    people = import ./user.nix;
-    service = import ./instance.nix;
-    system = import ./device.nix;
+    people = import ./users.nix;
+    services = import ./instances.nix;
+    machines = import ./devices.nix;
   };
 }

config/devices.nix

@@ -7,7 +7,7 @@ let
   userIdForUser0 = ["uid=1000"];
   userIdForUser1 = ["uid=1001"];
 in {
-  device = {
+  devices = {
     # Desktop
     desktop = {
       label = "Desktop";

config/instances.nix

@@ -14,7 +14,7 @@ let
 
   varLib = "/var/lib";
 in {
-  instance = {
+  instances = {
     web = {
       domains = {
         url0 = domain0;

config/users.nix

@@ -6,7 +6,7 @@ in {
     user0
     user1
     ;
-  user = {
+  users = {
     "${user0}" = {
       name = "Nick";
       aliases = {