Reorganize repository

machines/kharbranth/default.nix

@@ -10,21 +10,33 @@
   # Machine-specific module settings
   chvp = {
     stateVersion = "20.09";
-    graphical = true;
-    bluetooth.enable = true;
-    git.email = "charlotte.vanpetegem@ugent.be";
-    zfs = {
-      enable = true;
-      encrypted = true;
-      backups = [
-        {
-          path = "rpool/safe/data";
-          remotePath = "zdata/recv/kharbranth/safe/data";
-          fast = true;
-          location = "lasting-integrity";
-        }
-      ];
-      rootDataset = "rpool/local/root";
+    base = {
+      bluetooth.enable = true;
+      network.networkmanager.enable = true;
+      zfs = {
+        encrypted = true;
+        backups = [
+          {
+            path = "rpool/safe/data";
+            remotePath = "zdata/recv/kharbranth/safe/data";
+            fast = true;
+            location = "lasting-integrity";
+          }
+        ];
+        rootDataset = "rpool/local/root";
+      };
     };
+    development = {
+      enable = true;
+      android.enable = true;
+      git.email = "charlotte.vanpetegem@ugent.be";
+    };
+    graphical.enable = true;
+    programs = {
+      eid.enable = true;
+      hledger.enable = true;
+      obs.enable = true;
+    };
+    work.enable = true;
   };
 }

machines/kholinar/default.nix

@@ -10,28 +10,37 @@
   # Machine-specific module settings
   chvp = {
     stateVersion = "20.09";
-    graphical = true;
-    android.enable = true;
-    bluetooth.enable = true;
-    dropbox.enable = true;
-    git.email = "charlotte@vanpetegem.me";
-    minecraft.client = true;
-    mumble.enable = true;
-    obs.enable = true;
-    steam.enable = true;
-    zeroad.enable = true;
-    zfs = {
-      enable = true;
-      encrypted = true;
-      backups = [
-        {
-          path = "rpool/safe/data";
-          remotePath = "zdata/recv/kholinar/safe/data";
-          fast = true;
-          location = "lasting-integrity";
-        }
-      ];
-      rootDataset = "rpool/local/root";
+    base = {
+      bluetooth.enable = true;
+      network.networkmanager.enable = true;
+      zfs = {
+        encrypted = true;
+        backups = [
+          {
+            path = "rpool/safe/data";
+            remotePath = "zdata/recv/kholinar/safe/data";
+            fast = true;
+            location = "lasting-integrity";
+          }
+        ];
+        rootDataset = "rpool/local/root";
+      };
     };
+    development = {
+      enable = true;
+      android.enable = true;
+    };
+    games.enable = true;
+    graphical.enable = true;
+    programs = {
+      calibre.enable = true;
+      deluge.enable = true;
+      dropbox.enable = true;
+      eid.enable = true;
+      hledger.enable = true;
+      obs.enable = true;
+    };
+    # It's a pandemic.
+    work.enable = true;
   };
 }

machines/lasting-integrity/default.nix

@@ -13,23 +13,23 @@
   # Machine-specific module settings
   chvp = {
     stateVersion = "20.09";
-    docker.enable = true;
-    nginx.enable = true;
-    nextcloud.enable = true;
-    ovh.enable = true;
-    smartd.enable = true;
-    sshd.enable = true;
-    syncthing-server.enable = true;
-    tetris.enable = true;
-    zfs = {
-      enable = true;
-      backups = [{
-        path = "zroot/safe/data";
-        remotePath = "zdata/recv/lasting-integrity/safe/data";
-        fast = true;
-        location = "192.168.0.1";
-      }];
-      rootDataset = "zroot/local/root";
+    base = {
+      network.ovh.enable = true;
+      zfs = {
+        backups = [{
+          path = "zroot/safe/data";
+          remotePath = "zdata/recv/lasting-integrity/safe/data";
+          fast = true;
+          location = "192.168.0.1";
+        }];
+        rootDataset = "zroot/local/root";
+      };
+    };
+    development.enable = true;
+    games.tetris.server = true;
+    services = {
+      nextcloud.enable = true;
+      syncthing.enable = true;
     };
   };
 }

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;
     };
   };
 }