Compare commits

...

3 commits

Author SHA1 Message Date
bce8fbbb78
Correctly use mkMerge
Some checks failed
EVAL aarch64-linux.sisko
BUILD aarch64-linux.sisko
UPLOAD aarch64-linux.sisko
DOWNLOAD aarch64-linux.sisko
CACHIX aarch64-linux.sisko
ATTIC aarch64-linux.sisko
/ test (push) Successful in 11m35s
2025-03-14 18:09:29 +01:00
c327895c6b
Re-add vpn.aciceri.dev 2025-03-14 18:09:13 +01:00
37ae2afef6
Enable mosh on sisko 2025-03-14 18:09:05 +01:00
3 changed files with 18 additions and 13 deletions

View file

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

View file

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

View file

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