Reorganize and comment some of the nix code

1 files changed, 27 insertions, 31 deletions

diff --git a/default.nix b/default.nix
index 0dca989..5199252 100644
--- a/default.nix
+++ b/default.nix
@@ -12,43 +12,49 @@ let
     sha256 = "0lpz08qviccvpfws2nm83n7m2r8add2wvfg9bljx9yxx8107r919";
   };
 in rec {
-  Com.Simatime.cloud = buildOS {
+  # Cloud infrastructure, always online. Mostly for messaging-related
+  # stuff.
+  #
+  Com.Simatime.Cloud = buildOS {
     enableVpn = true;
     ipAddress = "159.89.128.69";
     vpnRsaPrivateKeyFile = "/etc/tinc/rsa_key.priv";
     vpnEd25519PrivateKeyFile = "/etc/tinc/ed25519_key.priv";
     configuration = {
       imports = [
-        ./Com/Simatime/hardware.nix
-        ./Com/Simatime/networking.nix
         ./Com/Simatime/packages.nix
-        ./Com/Simatime/git.nix
-        ./Com/Simatime/mail.nix
-        ./Com/Simatime/web.nix
-        ./Com/Simatime/chat.nix
-        ./Com/Simatime/znc.nix
+        ./Com/Simatime/users.nix
+        ./Com/Simatime/Cloud/chat.nix
+        ./Com/Simatime/Cloud/git.nix
+        ./Com/Simatime/Cloud/hardware.nix
+        ./Com/Simatime/Cloud/mail.nix
+        ./Com/Simatime/Cloud/networking.nix
+        ./Com/Simatime/Cloud/web.nix
+        ./Com/Simatime/Cloud/znc.nix
         nixos-mailserver
       ];
-      programs.mosh = {
-        enable = true;
-        withUtempter = true;
-      };
+      networking.hostName = "simatime";
+      networking.domain = "simatime.com";
     };
   };
-  Com.Simatime.dev = buildOS {
+  # Dev machine for work and building stuff.
+  #
+  Com.Simatime.Dev = buildOS {
     enableVpn = true;
     ipAddress = "69.181.254.154";
-    vpnConnectTo = "com.simatime";
-    vpnRsaPrivateKeyFile = "/etc/tinc/rsa_key.priv";
-    vpnEd25519PrivateKeyFile = "/etc/tinc/ed25519_key.priv";
     configuration = {
       imports = [
         ./Com/Simatime/packages.nix
-        ./Com/Simatime/dev/hardware.nix
-        ./Com/Simatime/dev/configuration.nix
+        ./Com/Simatime/users.nix
+        ./Com/Simatime/Dev/configuration.nix
+        ./Com/Simatime/Dev/hardware.nix
       ];
+      networking.hostName = "lithium";
+      networking.domain = "dev.simatime.com";
     };
   };
+  # Serval is the production server for apps
+  #
   Com.Simatime.Serval = buildOS {
     deps = { que-server = Run.Que.Server; };
     configuration = {
@@ -56,24 +62,14 @@ in rec {
         ./Com/Simatime/packages.nix
         ./Com/Simatime/Serval/hardware.nix
         ./Com/Simatime/Serval/networking.nix
-        ./Run/Que/service.nix
         ./Com/Simatime/Serval/configuration.nix
+        ./Run/Que/service.nix
       ];
-      networking.hostName = "serval.simatime.com";
+      networking.hostName = "serval";
+      networking.domain = "serval.simatime.com";
       boot.enableContainers = true;
     };
   };
-  Com.InfluencedByBooks.os = buildOS {
-    configuration = {
-      imports = [
-        ./Com/InfluencedByBooks/service.nix
-        ./Com/Simatime/packages.nix
-      ];
-      nixpkgs.config.allowUnfree = true;
-      boot.isContainer = true;
-      networking.useDHCP = false;
-    };
-  };
   Com.InfluencedByBooks.Server = buildGhc {
     name = "Com.InfluencedByBooks.Server";
     nick = "ibb";