feat: moved ollama, tailscale, and sync into folders following the new storage pattern

This commit is contained in:
Leyla Becker 2025-11-08 18:28:34 -06:00
parent b67be1472a
commit d283f88160
11 changed files with 215 additions and 117 deletions

View file

@ -0,0 +1,6 @@
{...}: {
imports = [
./sync.nix
./storage.nix
];
}

View file

@ -0,0 +1,57 @@
{
config,
lib,
...
}: let
mountDir = "/mnt/sync";
configDir = "/etc/syncthing";
in {
options = {
services.syncthing.impermanence.enable = lib.mkOption {
type = lib.types.bool;
default = config.services.syncthing.enable && config.storage.impermanence.enable;
};
};
config = lib.mkIf config.services.syncthing.enable (
lib.mkMerge [
(lib.mkIf config.storage.zfs.enable (lib.mkMerge [
{
# Syncthing needs persistent storage for configuration and data
}
(lib.mkIf (!config.services.syncthing.impermanence.enable) {
# TODO: placeholder to configure a unique dataset for this service
})
(lib.mkIf config.services.syncthing.impermanence.enable {
assertions =
[
{
assertion = config.services.syncthing.configDir == configDir;
message = "syncthing config dir does not match persistence";
}
]
++ lib.attrsets.mapAttrsToList (_: folder: {
assertion = lib.strings.hasPrefix mountDir folder.path;
message = "syncthing folder ${folder.label} is stored at ${folder.path} which not under the persisted path of ${mountDir}";
})
config.services.syncthing.settings.folders;
storage.impermanence.datasets."persist/system/root" = {
directories = {
"${mountDir}" = {
enable = true;
owner.name = "syncthing";
group.name = "syncthing";
};
"${configDir}" = {
enable = true;
owner.name = "syncthing";
group.name = "syncthing";
};
};
};
})
]))
]
);
}

View file

@ -0,0 +1,36 @@
{
config,
lib,
syncthingConfiguration,
...
}: let
mountDir = "/mnt/sync";
configDir = "/etc/syncthing";
in {
config = lib.mkMerge [
{
systemd = lib.mkIf config.services.syncthing.enable {
tmpfiles.rules = [
"A ${mountDir} - - - - u:syncthing:rwX,g:syncthing:rwX,o::-"
"d ${mountDir} 2755 syncthing syncthing -"
"d ${config.services.syncthing.dataDir} 775 syncthing syncthing -"
"d ${config.services.syncthing.configDir} 755 syncthing syncthing -"
];
};
}
(lib.mkIf config.services.syncthing.enable (lib.mkMerge [
{
services.syncthing = {
user = "syncthing";
group = "syncthing";
dataDir = "${mountDir}/default";
configDir = configDir;
overrideDevices = true;
overrideFolders = true;
configuration = syncthingConfiguration;
deviceName = config.networking.hostName;
};
}
]))
];
}