From bdccb2f265b5649b5906707dfe6e5f30784a6dfc Mon Sep 17 00:00:00 2001 From: Henri Dohmen Date: Mon, 26 May 2025 23:15:15 +0200 Subject: [PATCH] wireguard --- mod/pc-common/network.nix | 9 +++++++-- var/wg.nix | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/mod/pc-common/network.nix b/mod/pc-common/network.nix index 3b7bf12..f86d4b0 100644 --- a/mod/pc-common/network.nix +++ b/mod/pc-common/network.nix @@ -1,4 +1,9 @@ -{ host, var, ... }: +{ + host, + var, + lib, + ... +}: { hardware.bluetooth.enable = true; services.blueman.enable = true; @@ -18,7 +23,7 @@ "onet" = { address = var.wg.wireguard-network.${host}.ips; privateKeyFile = var.wg.keyFile; - peers = var.wg.peers-for host; + peers = [ (lib.removeAttrs var.wg.wireguard-network."roam" [ "ips" ]) ]; }; "mullvad" = let diff --git a/var/wg.nix b/var/wg.nix index 6a82b6e..483f139 100644 --- a/var/wg.nix +++ b/var/wg.nix @@ -8,7 +8,7 @@ rec { wireguard-network = { "roam" = { publicKey = publicKey."roam"; - ips = [ "10.10.11.1/24" ]; + ips = [ "10.10.11.1/32" ]; allowedIPs = [ "10.10.11.0/24" ]; endpoint = "185.163.117.158:51820"; persistentKeepalive = 17; @@ -20,8 +20,8 @@ rec { }; "c2" = { publicKey = publicKey."c2"; - ips = [ "10.10.11.2/24" ]; - allowedIPs = [ "10.10.11.2/32" ]; + ips = [ "10.10.11.3/24" ]; + allowedIPs = [ "10.10.11.3/32" ]; }; }; keyFile = "/var/secrets/wg.key";