From d3f98327aa003f0df6b514f82ff726a9137be283 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 20 Nov 2025 00:38:54 -0600 Subject: [PATCH 1/5] feat: added port 80 --- modules/config/instances/config/mastodon.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/config/instances/config/mastodon.nix b/modules/config/instances/config/mastodon.nix index 3ed23f4..8aa4d3b 100755 --- a/modules/config/instances/config/mastodon.nix +++ b/modules/config/instances/config/mastodon.nix @@ -31,6 +31,9 @@ in "mast" "md" ]; + ports = { + port0 = 80; + }; interface = { id = "vm-${name}"; mac = "02:00:00:00:55:05"; From 8a0e8183bb5ed6e70ce14952b5dc441611f3d8a0 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 20 Nov 2025 00:39:18 -0600 Subject: [PATCH 2/5] chore: updated ips --- .../bookmarks/config/flake/selfHosted.nix | 45 +++++++------------ 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix b/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix index 0053eb5..5ab6ace 100755 --- a/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix +++ b/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix @@ -1,12 +1,7 @@ { flake, ... }: let - inherit (flake.config.machines.devices) - ceres - mars - ; - inherit (flake.config.services) - instances - ; + inherit (flake.config.machines.devices) mars; + inherit (flake.config.services) instances; makeBookmarks = { @@ -21,23 +16,24 @@ 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 = [ - instances.audiobookshelf.name - instances.forgejo.name - instances.glance.name - instances.jellyfin.name - instances.mastodon.name - instances.ollama.name - instances.opencloud.name - instances.searx.name - instances.vaultwarden.name - instances.prompter.name - instances.firefly-iii.name - ]; + services = instanceList; + } + { + suffix = "(Server)"; + urlTemplate = + name: "http://${instances.${name}.interface.ip}:${builtins.toString instances.${name}.ports.port0}"; + services = instanceList; } { suffix = "(Desktop)"; @@ -47,15 +43,6 @@ 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); From aca06b9d5f911a4305db663bc7e033fb1237849c Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 20 Nov 2025 00:39:25 -0600 Subject: [PATCH 3/5] feat: added defenseio miner --- modules/nixos/guests/defenseio/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/modules/nixos/guests/defenseio/default.nix b/modules/nixos/guests/defenseio/default.nix index 2863bff..11c1a8c 100755 --- a/modules/nixos/guests/defenseio/default.nix +++ b/modules/nixos/guests/defenseio/default.nix @@ -41,8 +41,14 @@ in autostart = true; config = let + ceresCpu = 35; + erisCpu = 4; + marsCpu = 18; + deimosCpu = 5; + phobosCpu = 5; + macAddress = "02:00:00:00:00:${macOctet}"; - workers = deviceLogic 35 4 18 5 6; + workers = deviceLogic ceresCpu erisCpu marsCpu deimosCpu phobosCpu; in { environment.systemPackages = [ @@ -67,7 +73,16 @@ in mac = macAddress; } ]; - mem = deviceLogic 45000 5120 22000 6144 7168; + mem = + let + num = 1024; + ceresRam = num * 45; + erisRam = num * 6; + marsRam = num * 22; + deimosRam = num * 6; + phobosRam = num * 7; + in + deviceLogic ceresRam erisRam marsRam deimosRam phobosRam; shares = [ { mountPoint = "/nix/.ro-store"; From e92a3de3558ebc3bd8dff0ddb042eb3d3cca21a9 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 20 Nov 2025 02:35:53 -0600 Subject: [PATCH 4/5] feat: increased resources --- modules/nixos/guests/defenseio/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/nixos/guests/defenseio/default.nix b/modules/nixos/guests/defenseio/default.nix index 11c1a8c..0662ba7 100755 --- a/modules/nixos/guests/defenseio/default.nix +++ b/modules/nixos/guests/defenseio/default.nix @@ -41,9 +41,9 @@ in autostart = true; config = let - ceresCpu = 35; - erisCpu = 4; - marsCpu = 18; + ceresCpu = 45; + erisCpu = 5; + marsCpu = 20; deimosCpu = 5; phobosCpu = 5; @@ -76,10 +76,10 @@ in mem = let num = 1024; - ceresRam = num * 45; - erisRam = num * 6; - marsRam = num * 22; - deimosRam = num * 6; + ceresRam = num * 50; + erisRam = num * 7; + marsRam = num * 24; + deimosRam = num * 7; phobosRam = num * 7; in deviceLogic ceresRam erisRam marsRam deimosRam phobosRam; From f8a430380a10f896591ab46b2726d012de297685 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 20 Nov 2025 02:36:04 -0600 Subject: [PATCH 5/5] feat: added tuios --- modules/nixos/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 917add3..9da2991 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -14,6 +14,7 @@ in plasma plymouth sddm + tuios wireguard microvm defenseio