Compare commits

..

No commits in common. "bce8fbbb78a6f16e4e13b69a5717345e2fc228a9" and "9d4b2b4b7f80829f4a0f9ed0e925bf3844dc9fd4" have entirely different histories.

3 changed files with 13 additions and 18 deletions

View file

@ -32,7 +32,6 @@
"matrix"
"radarr"
"zerotier"
"mosh"
]
++ [
./disko.nix

View file

@ -11,7 +11,6 @@
"photos.aciceri.dev"
"jelly.aciceri.dev"
"matrix.aciceri.dev"
"vpn.aciceri.dev"
];
apiTokenFile = config.age.secrets.cloudflare-dyndns-api-token.path;
};

View file

@ -1,17 +1,14 @@
{ config, lib, ... }:
{
config = lib.mkMerge [
{
services.zerotierone = {
enable = true;
joinNetworks = [ "632ea29085af0cb4" ];
};
}
(lib.mkIf (config.networking.hostName == "sisko") {
environment.persistence."/persist".directories = [
"/var/lib/zerotier-one"
];
})
];
}
lib.mkMerge [
{
services.zerotierone = {
enable = true;
joinNetworks = [ "632ea29085af0cb4" ];
};
}
(lib.optionalAttrs (config.networking.hostName == "sisko") {
environment.persistence."/persist".directories = [
"/var/lib/zerotier-one"
];
})
]