commit 27391121d592f8c38477bb31676ba390f5e196d2
parent a8a18d05f524fa8b8cc8ef9285930e174fb5675a
Author: Katja Ramona Sophie Kwast (zaphyra) <git@zaphyra.eu>
Date: Fri, 14 Nov 2025 19:18:22 +0100
parent a8a18d05f524fa8b8cc8ef9285930e174fb5675a
Author: Katja Ramona Sophie Kwast (zaphyra) <git@zaphyra.eu>
Date: Fri, 14 Nov 2025 19:18:22 +0100
hosts: cleanup dn42 foo
4 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/config/nixos/modules/presets/zaphyra/networkManagerProfiles/dn42.nix b/config/nixos/modules/presets/zaphyra/networkManagerProfiles/dn42.nix @@ -2,6 +2,7 @@ povSelf, lib, config, + hostConfig, ... }: let @@ -35,7 +36,7 @@ in }; ipv6 = { addr-gen-mode = "default"; - address1 = "fd6b:6174:6a61::3/128"; + address1 = "${hostConfig.networking.dn42Address}/128"; dns = "fd6b:6174:6a61::1;"; dns-search = "~dn42;"; method = "manual";
diff --git a/hosts/haueri/default.nix b/hosts/haueri/default.nix @@ -14,7 +14,7 @@ networking = { hasDN42 = true; - dn42Address = "fd6b:6174:6a61::10"; + dn42Address = "fd6b:6174:6a61::15"; }; configuration =
diff --git a/hosts/novus/default.nix b/hosts/novus/default.nix @@ -128,11 +128,13 @@ wireguardPeers = [ { + # polaris PublicKey = "nvyhYuWJl/dKyV/2+bDrUisvL3mi38PsNzfdIDDwSjY="; AllowedIPs = [ "2a03:4000:4d:5e:acab::2/128" ]; PersistentKeepalive = 10; } { + # pratorum PublicKey = "CdnaBQL7c7zX0ORKhYyXp3HZ1kjqoEIGW03/mCCwAgI="; AllowedIPs = [ "2a03:4000:4d:5e:acab::3/128" ]; PersistentKeepalive = 10;
diff --git a/hosts/novus/dn42.nix b/hosts/novus/dn42.nix @@ -176,7 +176,7 @@ wireguardPeers = [ { - #morio + # morio PublicKey = "BUAac0PtF+4QmsFMVoQOLWRtSRYjy1y2nKvTA9BcXC0="; AllowedIPs = [ "fd6b:6174:6a61::2/128" @@ -185,23 +185,19 @@ PersistentKeepalive = 10; } { - #zaphyraThinkPad + # zaphyraThinkPad PublicKey = "7drlp9TmHgSgqSR1PynfAzf8BIH4LWVuFDtPqGs88EY="; - AllowedIPs = [ - "fd6b:6174:6a61::3/128" - ]; + AllowedIPs = [ "fd6b:6174:6a61::3/128" ]; PersistentKeepalive = 10; } { - #zaphyraPhone + # zaphyraApplePhone PublicKey = "3rp8iD+Nk9DsyM/JCvrV7bBnEzioG30SDqOQhNWwsVs="; - AllowedIPs = [ - "fd6b:6174:6a61::4/128" - ]; + AllowedIPs = [ "fd6b:6174:6a61::4/128" ]; PersistentKeepalive = 10; } { - #zaphyraHomeRouter + # zaphyraHomeRouter PublicKey = "nvyhYuWJl/dKyV/2+bDrUisvL3mi38PsNzfdIDDwSjY="; AllowedIPs = [ "fd6b:6174:6a61::5/128" @@ -210,11 +206,21 @@ PersistentKeepalive = 10; } { - #zaphyraHomeServerGrog + # zaphyraHomeServerGrog PublicKey = "CdnaBQL7c7zX0ORKhYyXp3HZ1kjqoEIGW03/mCCwAgI="; - AllowedIPs = [ - "fd6b:6174:6a61::10/128" - ]; + AllowedIPs = [ "fd6b:6174:6a61::10/128" ]; + PersistentKeepalive = 10; + } + { + # zaphyraPixel + PublicKey = "ski1Uya2PSCZsrBblcgoM9WL5h+1KAd61uZD2sfRDjE="; + AllowedIPs = [ "fd6b:6174:6a61::11/128" ]; + PersistentKeepalive = 10; + } + { + # haueri + PublicKey = "YdseqpjpKGV7JWWDEJOAtqB3tzk7vI/gPFiqmCyeVTM="; + AllowedIPs = [ "fd6b:6174:6a61::15/128" ]; PersistentKeepalive = 10; } ];