modules/config/instances/config/mastodon.nix

@@ -31,9 +31,6 @@ in
     "mast"
     "md"
   ];
-  ports = {
-    port0 = 80;
-  };
   interface = {
     id = "vm-${name}";
     mac = "02:00:00:00:55:05";

modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix

@@ -1,7 +1,12 @@
 { flake, ... }:
 let
-  inherit (flake.config.machines.devices) mars;
+  inherit (flake.config.machines.devices)
-  inherit (flake.config.services) instances;
+    ceres
+    mars
+    ;
+  inherit (flake.config.services)
+    instances
+    ;
 
   makeBookmarks =
     {
@@ -16,24 +21,23 @@ let
       keyword = instances.${name}.short;
     }) (builtins.map (service: instances.${service}.name) services);
 
-  instanceList = [
-    instances.forgejo.name
-    instances.jellyfin.name
-    instances.mastodon.name
-    instances.vaultwarden.name
-    instances.firefly-iii.name
-  ];
   bookmarkConfigs = [
     {
       suffix = "(Remote)";
       urlTemplate = name: "https://${instances.${name}.domains.url0}";
-      services = instanceList;
+      services = [
-    }
+        instances.audiobookshelf.name
-    {
+        instances.forgejo.name
-      suffix = "(Server)";
+        instances.glance.name
-      urlTemplate =
+        instances.jellyfin.name
-        name: "http://${instances.${name}.interface.ip}:${builtins.toString instances.${name}.ports.port0}";
+        instances.mastodon.name
-      services = instanceList;
+        instances.ollama.name
+        instances.opencloud.name
+        instances.searx.name
+        instances.vaultwarden.name
+        instances.prompter.name
+        instances.firefly-iii.name
+      ];
     }
     {
       suffix = "(Desktop)";
@@ -43,6 +47,15 @@ let
         instances.syncthing.name
       ];
     }
+    {
+      suffix = "(Server)";
+      urlTemplate =
+        name: "http://${ceres.ip.address0}:${builtins.toString instances.${name}.ports.port0}";
+      services = [
+        instances.jellyfin.name
+        instances.firefly-iii.name
+      ];
+    }
   ];
 
   generatedBookmarks = builtins.concatLists (builtins.map makeBookmarks bookmarkConfigs);

modules/nixos/default.nix

@@ -14,7 +14,6 @@ in
           plasma
           plymouth
           sddm
-          tuios
           wireguard
           microvm
           defenseio

modules/nixos/guests/defenseio/default.nix

@@ -41,14 +41,8 @@ in
         autostart = true;
         config =
           let
-            ceresCpu = 45;
-            erisCpu = 5;
-            marsCpu = 20;
-            deimosCpu = 5;
-            phobosCpu = 5;
-
             macAddress = "02:00:00:00:00:${macOctet}";
-            workers = deviceLogic ceresCpu erisCpu marsCpu deimosCpu phobosCpu;
+            workers = deviceLogic 35 4 18 5 6;
           in
           {
             environment.systemPackages = [
@@ -73,16 +67,7 @@ in
                   mac = macAddress;
                 }
               ];
-              mem =
+              mem = deviceLogic 45000 5120 22000 6144 7168;
-                let
-                  num = 1024;
-                  ceresRam = num * 50;
-                  erisRam = num * 7;
-                  marsRam = num * 24;
-                  deimosRam = num * 7;
-                  phobosRam = num * 7;
-                in
-                deviceLogic ceresRam erisRam marsRam deimosRam phobosRam;
               shares = [
                 {
                   mountPoint = "/nix/.ro-store";