Reorganize repository

machines/urithiru/default.nix

@@ -4,7 +4,6 @@
   imports = [
     ./hardware.nix
     ./secret.nix
-    ../../containers/data-access
   ];
 
   time.timeZone = "Europe/Berlin";
@@ -17,33 +16,33 @@
   # Machine-specific module settings
   chvp = {
     stateVersion = "20.09";
-    accentor.enable = true;
-    nginx.enable = true;
-    ovh.enable = true;
-    smartd.enable = true;
-    sshd.enable = true;
-    teeworlds.enable = false;
-    zeroad = {
-      enable = true;
-      asServer = true;
+    base = {
+      network.ovh.enable = true;
+      zfs = {
+        backups = [
+          {
+            path = "zroot/safe/data";
+            remotePath = "zdata/recv/urithiru/safe/data";
+            fast = true;
+            location = "192.168.0.2";
+          }
+          {
+            path = "zdata/data";
+            remotePath = "zdata/data";
+            fast = false;
+            location = "192.168.0.2";
+          }
+        ];
+        rootDataset = "zroot/local/root";
+      };
     };
-    zfs = {
-      enable = true;
-      backups = [
-        {
-          path = "zroot/safe/data";
-          remotePath = "zdata/recv/urithiru/safe/data";
-          fast = true;
-          location = "192.168.0.2";
-        }
-        {
-          path = "zdata/data";
-          remotePath = "zdata/data";
-          fast = false;
-          location = "192.168.0.2";
-        }
-      ];
-      rootDataset = "zroot/local/root";
+    games = {
+      teeworlds.server = false;
+      zeroad.server = true;
+    };
+    services = {
+      accentor.enable = true;
+      data-access.enable = true;
     };
   };
 }