From cb11da0008991c96b29818ab50c6f107ccec170d Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 27 Nov 2025 05:12:15 -0600 Subject: [PATCH] feat: tweaked some microvms --- modules/nixos/guests/jellyfin/default.nix | 11 ++++++++- modules/nixos/guests/mastodon/default.nix | 11 +++++++-- .../opencloud/ceresOpenCloud/default.nix | 13 ++++++++-- modules/nixos/guests/projectSite/default.nix | 2 +- modules/nixos/guests/torrent/default.nix | 24 ++++++++++--------- secrets/secrets.yaml | 6 ++--- 6 files changed, 47 insertions(+), 20 deletions(-) diff --git a/modules/nixos/guests/jellyfin/default.nix b/modules/nixos/guests/jellyfin/default.nix index 5115be3..782d37d 100755 --- a/modules/nixos/guests/jellyfin/default.nix +++ b/modules/nixos/guests/jellyfin/default.nix @@ -1,6 +1,7 @@ { config, flake, + pkgs, ... }: let @@ -82,7 +83,7 @@ in systemd.services.systemd-networkd.wantedBy = [ "multi-user.target" ]; microvm = { - vcpu = 1; + vcpu = 2; mem = 1024 * 3; hypervisor = "qemu"; interfaces = [ @@ -131,6 +132,14 @@ in } ]; }; + environment.systemPackages = builtins.attrValues { + inherit (pkgs) + yazi + bottom + trashy + fastfetch + ; + }; }; }; }; diff --git a/modules/nixos/guests/mastodon/default.nix b/modules/nixos/guests/mastodon/default.nix index be0a8c9..547d5b1 100755 --- a/modules/nixos/guests/mastodon/default.nix +++ b/modules/nixos/guests/mastodon/default.nix @@ -394,10 +394,17 @@ in ]; }; - environment.systemPackages = [ fedifetcherPython ]; + environment.systemPackages = builtins.attrValues { + inherit + fedifetcherPython + ; + inherit (pkgs) + bottom + ; + }; microvm = { - vcpu = 4; + vcpu = 2; mem = 1024 * 6; hypervisor = "qemu"; interfaces = [ diff --git a/modules/nixos/guests/opencloud/ceresOpenCloud/default.nix b/modules/nixos/guests/opencloud/ceresOpenCloud/default.nix index 25845b5..fe4cc78 100755 --- a/modules/nixos/guests/opencloud/ceresOpenCloud/default.nix +++ b/modules/nixos/guests/opencloud/ceresOpenCloud/default.nix @@ -83,8 +83,8 @@ in systemd.services.systemd-networkd.wantedBy = [ "multi-user.target" ]; microvm = { - vcpu = 1; - mem = 1024; + vcpu = 2; + mem = 1024 * 3; hypervisor = "qemu"; interfaces = [ { @@ -126,6 +126,15 @@ in } ]; }; + environment.systemPackages = builtins.attrValues { + inherit (pkgs) + yazi + bottom + trashy + fastfetch + ; + }; + }; }; }; diff --git a/modules/nixos/guests/projectSite/default.nix b/modules/nixos/guests/projectSite/default.nix index b3aadfb..030d22d 100755 --- a/modules/nixos/guests/projectSite/default.nix +++ b/modules/nixos/guests/projectSite/default.nix @@ -59,7 +59,7 @@ in microvm = { vcpu = 2; - mem = 3072; + mem = 1024; hypervisor = "qemu"; interfaces = [ { diff --git a/modules/nixos/guests/torrent/default.nix b/modules/nixos/guests/torrent/default.nix index 64020b6..fe7f6a5 100755 --- a/modules/nixos/guests/torrent/default.nix +++ b/modules/nixos/guests/torrent/default.nix @@ -29,8 +29,8 @@ in privateKeyFile = "/run/secrets/wireguard-pass"; peers = [ { - publicKey = "SFesR+3u5/vyQGeaCSREjs4m2WznwFlWAQ9CE3QSnRg="; - endpoint = "104.254.95.98:${builtins.toString torrentPort}"; + publicKey = "QPfiwJQmt5VLEOh1ufLbi1lj6LUnwQY0tgDSh3pWx1k="; + endpoint = "185.111.110.1:${builtins.toString torrentPort}"; allowedIPs = [ "0.0.0.0/0" "::/0" @@ -76,10 +76,9 @@ in Port = torrentPort; MaxConnectionsPerTorrent = -1; MaxUploads = -1; - MaxUploadsPerTorrent = -1; - MaxActiveDownloads = -1; - MaxActiveUploads = -1; - MaxActiveTorrents = -1; + MaxActiveDownloads = 999; + MaxActiveUploads = 999; + MaxActiveTorrents = 999; }; }; @@ -133,7 +132,7 @@ in }; microvm = { - vcpu = 1; + vcpu = 4; mem = 1024 * 1; hypervisor = "qemu"; @@ -180,10 +179,13 @@ in ]; }; - environment.systemPackages = with pkgs; [ - wireguard-tools - speedtest-go - ]; + environment.systemPackages = builtins.attrValues { + inherit (pkgs) + wireguard-tools + speedtest-go + bottom + ; + }; }; }; diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index 5a8f20d..db9465f 100755 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -56,7 +56,7 @@ firefly-iii: data: ENC[AES256_GCM,data:921LhcRTWVk24eEAQoDMV+RllSP3PbSXCCIDXlQA80Mq,iv:YXEgas77DgdyPTnBZa/ySjcERBIwmdDZJbijeNKNF24=,tag:Wj25wA7tLJ2bZ/faG9DUhg==,type:str] smtp: ENC[AES256_GCM,data:+e4MiRZ2WOZyWYpMf+By1Eb45ih4TA+svLI2+00yQk82,iv:+52+kJouMwkOSDEaOCA8V80+wT/VzNxgtCkOO68SCdk=,tag:YrtrJAXIhQpsUTEeYvrVwQ==,type:str] proton: - wireguard-pass: ENC[AES256_GCM,data:nHks/AYJGEuv8Dk2DWi01dFlaZtB1YWUc6BgJ+hu4BPS5aNK86mQRV31dIGV,iv:ht2W1OaqQ6pVrqqKxvzPml2ShPusNNI0LBjiagWmdo4=,tag:OSzqYqxsHaDy+xNl2j8axQ==,type:str] + wireguard-pass: ENC[AES256_GCM,data:u3riHMDyK+DxFAGpdP7zTqZMfp//W3pb3WRp/iS/pAf6ItY9PNFClm7Gh4Dn,iv:8jfPQALR+J3VZVL+a2XHwuL8P8yhZ4OcjhVbCTBADwE=,tag:H42pKD/tlDXUlIVVzdv+DQ==,type:str] backblaze: env: ENC[AES256_GCM,data:cdOYt77KocuGB3aqYz13oBokoLkEIgI1AW+cYC5uutgZYujG3PqoLEh6Gvbpzn3O+0OWg1/4UAYr4f2v7oCsgwFzPWS3HrhqC5+kIBjrPCyAnxDxlu2xaQ9hR+ogFh5UTDo=,iv:6+jx4Dj5CNV72DAss6NNYm44f9gSHco/EUBvL2o2CNI=,tag:6/cx84MgTDqQJxu/zINEeA==,type:str] repo: ENC[AES256_GCM,data:sRae9XELIfkWPaXelCdgEXIDbLTHVqGcRO0o+WA9aBfB8MUw92JjRCYgMgGXT0Apy38eszyuEHFB3XPpRmtQ7g==,iv:EilVA9zdHm6B9pTIhNxyj6Th1248nXvh0kpnEqZJ5HI=,tag:q9ASAgx5vgY0IePws4rT5Q==,type:str] @@ -73,7 +73,7 @@ sops: bXBOa1VSakoyaWxpODJEOU11QUZCaUEK8Ch9Ten3DdrPHF1DTH2qei85AlHUOaLD aNfzakake7ej+MxJYdKEU0bcWofNMKzIlZa2uM10KZSENDP8d8qlig== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-11-27T03:39:51Z" - mac: ENC[AES256_GCM,data:EdxVM3/0cvMX5cumM+LDn5/qgOCMB6uySunlvEkPy3GHG3dHULc4MAw7bgI9DZ8Y0R26ipBzTKEoWWIIwCLcT+r6KwCM/HVg7gjuY+YbEnU71jivAKNg902Ue8LWNSKLvw1kAHkgtT/jPuMTuHShBTNTYeTsW5mGsqcXhdWVWC4=,iv:A3xeAtFwn4i7ijOA/vZ+XJ9jUeyt1FrvvKrGg5SeyAM=,tag:C7PuVjmYcjFB/u5Hi22aWg==,type:str] + lastmodified: "2025-11-27T09:53:41Z" + mac: ENC[AES256_GCM,data:fV10gBOFgCTTMWAKv8tGnCz3TG0t0G19di4N4wEi2lsHeYDBk8ijumOM/wLY6Zds80y5u6s6hGwFpCcY5pChjQ/E/pOURHAY7rIqQmGm9yQnpECCfWLDJVgsQjliYRPD76WTEKlsevz/XCGfdITNuRAlU7tuWEEEgXvIKt+0Z/8=,iv:dA/zt7WQA5w+dZM53VunucZAQTBKRyzLaWaShhTMWzI=,tag:CUD7KGes5pNquMJfCm6dYQ==,type:str] unencrypted_suffix: _unencrypted version: 3.11.0