chore: cleaned up some stuff

This commit is contained in:
Nick 2025-12-13 20:35:53 -06:00
parent 09926277fd
commit 77dcbe3c33
12 changed files with 104 additions and 168 deletions

View file

@ -5,6 +5,8 @@
let
inherit (flake.config.people) user0;
inherit (flake.config.services.instances) syncthing;
inherit (import ../../../../helpers.nix { inherit flake; }) labHelpers;
inherit (labHelpers) mediaPath docsPath miscPath;
serviceCfg = syncthing;
in
{
@ -17,10 +19,6 @@ in
userMac,
ssh,
mnt,
folders,
devices,
tmp,
mounts,
}:
{
microvm.vms = {
@ -39,15 +37,11 @@ in
openDefaultPorts = true;
systemService = true;
guiAddress = "0.0.0.0:${toString serviceCfg.ports.port0}";
# guiPasswordFile = "/run/secrets/${user}-pass";
settings = {
gui = {
user = user;
password = pass;
};
folders = folders;
devices = devices;
options = {
urAccepted = -1;
};
@ -97,8 +91,10 @@ in
tmpfiles.rules = [
"d /var/lib/${serviceCfg.name} 0755 ${serviceCfg.name} ${serviceCfg.name} -"
]
++ tmp;
"d /var/lib/${serviceCfg.name}/docs 0755 ${serviceCfg.name} ${serviceCfg.name} -"
"d /var/lib/${serviceCfg.name}/media 0755 ${serviceCfg.name} ${serviceCfg.name} -"
"d /var/lib/${serviceCfg.name}/misc 0755 ${serviceCfg.name} ${serviceCfg.name} -"
];
};
microvm = {
vcpu = 1;
@ -136,14 +132,32 @@ in
source = "${mnt}/${serviceCfg.name}";
tag = "${serviceCfg.name}_${user}_data";
}
{
mountPoint = "/var/lib/${serviceCfg.name}/docs";
proto = "virtiofs";
source = docsPath user;
tag = "${serviceCfg.name}_${user}_docs";
}
{
mountPoint = "/var/lib/${serviceCfg.name}/media";
proto = "virtiofs";
source = mediaPath user;
tag = "${serviceCfg.name}_${user}_media";
}
{
mountPoint = "/var/lib/${serviceCfg.name}/misc";
proto = "virtiofs";
source = miscPath user;
tag = "${serviceCfg.name}_${user}_misc";
}
{
mountPoint = "/run/secrets";
proto = "virtiofs";
source = "/run/secrets/${serviceCfg.name}";
tag = "host_secrets";
}
]
++ mounts;
];
};
};
};