BIG changes. Make almost every server service modular, to distribute among multiple servers

hosts/envy/default.nix

@@ -5,6 +5,7 @@
     ./disko
     ./filesystems
     ./hardware
+    ./services
     ./users
     ../../modules/system
   ];
@@ -19,19 +20,6 @@
     lanzaboote.enable = true;
     fancyboot.enable = true;
     wireless.enable = true;
-    wireguard.client.enable = true;
-    libvirtd.enable = true;
     stateVersion = "24.11";
   };
-
-  # Services to make this work as a school laptop
-  services.globalprotect.enable = true;
-
-  virtualisation.vmware.host.enable = true;
-  nixpkgs.allowUnfreePackages = [ "vmware-workstation" ];
-
-  environment.persistence."/persist".directories = [
-    "/home/${config.sysusers.main}/vmware"
-    "/home/${config.sysusers.main}/.vmware"
-  ];
 }

hosts/envy/services/default.nix

@@ -0,0 +1,19 @@
+{ config, ... }:
+{
+  services = {
+    globalprotect.enable = true;
+    wireguard.client.enable = true;
+  };
+
+  virtualisation = {
+    libvirtd.enable = true;
+    vmware.host.enable = true;
+  };
+
+  nixpkgs.allowUnfreePackages = [ "vmware-workstation" ];
+
+  environment.persistence."/persist".directories = [
+    "/home/${config.sysusers.main}/vmware"
+    "/home/${config.sysusers.main}/.vmware"
+  ];
+}

hosts/midas/default.nix

@@ -6,6 +6,7 @@
     ./filesystems
     ./firewall
     ./hardware
+    ./services
     ./users
     ../../modules/system
   ];
@@ -26,16 +27,6 @@
   system = {
     server.enable = true;
     lanzaboote.enable = true;
-    fileserver.enable = true;
-    socialserver.enable = true;
-    wireguard.server.enable = true;
     stateVersion = "24.11";
   };
-
-  services.minecraft-servers.servers = {
-    velocity.enable = true;
-    johnside.enable = true;
-    cornworld.enable = true;
-    skyblock.enable = true;
-  };
 }

hosts/midas/services/default.nix

@@ -0,0 +1,25 @@
+{ ... }:
+{
+  services = {
+    fileserver.enable = true;
+    socialserver.enable = true;
+    webserver.enable = true;
+
+    forgejo.enable = true;
+    icecast.enable = true;
+    owncast.enable = true;
+    transmission.enable = true;
+    vaultwarden.enable = true;
+    wireguard.server.enable = true;
+
+    minecraft-servers = {
+      enable = true;
+      servers = {
+        velocity.enable = true;
+        johnside.enable = true;
+        cornworld.enable = true;
+        skyblock.enable = true;
+      };
+    };
+  };
+}

hosts/pear/default.nix

@@ -5,6 +5,7 @@
     ./disko
     ./filesystems
     ./hardware
+    ./services
     ./users
     ../../modules/system
   ];
@@ -18,19 +19,6 @@
     desktop.enable = true;
     fancyboot.enable = true;
     wireless.enable = true;
-    wireguard.client.enable = true;
-    libvirtd.enable = true;
     stateVersion = "24.11";
   };
-
-  # Services to make this work as a school laptop
-  services.globalprotect.enable = true;
-
-  virtualisation.vmware.host.enable = true;
-  nixpkgs.allowUnfreePackages = [ "vmware-workstation" ];
-
-  environment.persistence."/persist".directories = [
-    "/home/${config.sysusers.main}/vmware"
-    "/home/${config.sysusers.main}/.vmware"
-  ];
 }

hosts/pear/services/default.nix

@@ -0,0 +1,19 @@
+{ config, ... }:
+{
+  services = {
+    globalprotect.enable = true;
+    wireguard.client.enable = true;
+  };
+
+  virtualisation = {
+    libvirtd.enable = true;
+    vmware.host.enable = true;
+  };
+
+  nixpkgs.allowUnfreePackages = [ "vmware-workstation" ];
+
+  environment.persistence."/persist".directories = [
+    "/home/${config.sysusers.main}/vmware"
+    "/home/${config.sysusers.main}/.vmware"
+  ];
+}

hosts/prophet/default.nix

@@ -16,8 +16,12 @@
   };
 
   system = {
-    mailserver.enable = true;
-    wireguard.client.enable = true;
+    server.enable = true;
     stateVersion = "24.05";
   };
+
+  services = {
+    mailserver.enable = true;
+    wireguard.client.enable = true;
+  };
 }

hosts/redmond/default.nix

@@ -19,9 +19,10 @@
     lanzaboote.enable = true;
     fancyboot.enable = true;
     wireless.enable = true;
-    wireguard.client.enable = true;
     stateVersion = "24.05";
   };
 
+  services.wireguard.client.enable = true;
+
   environment.sessionVariables.WLR_RENDERER = lib.mkForce "gles2";
 }

hosts/tower/default.nix

@@ -25,8 +25,9 @@
   system = {
     desktop.enable = true;
     lanzaboote.enable = true;
-    libvirtd.enable = true;
     video.nvidia.enable = true;
     stateVersion = "24.05";
   };
+
+  virtualisation.libvirtd.enable = true;
 }