Jimbo/NixOS-Config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Rework some wireguard stuff

Browse source
This commit is contained in:
Jimbo 2024-10-20 13:58:10 -04:00
parent 57fcd83770
commit 97e837ac5f
3 changed files with 30 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
hosts/bomberman/system/default.nix
View file

@ -10,7 +10,7 @@
../../../modules/system/devices/boot/systemd ../../../modules/system/devices/boot/systemd
../../../modules/system/devices/networking ../../../modules/system/devices/networking
../../../modules/system/devices/networking/firewall/pc ../../../modules/system/devices/networking/firewall/pc
#../../../modules/system/devices/networking/wireguard/pc ../../../modules/system/devices/networking/wireguard/pc
../../../modules/system/programs/git ../../../modules/system/programs/git
../../../modules/system/programs/security ../../../modules/system/programs/security
../../../modules/system/services/common ../../../modules/system/services/common
@ -21,4 +21,5 @@
]; ];
networking.hostName = "bomberman"; networking.hostName = "bomberman";
systemd.network.networks.wg0.address = [ "10.100.0.19/24" ];
} }

46
modules/system/devices/networking/wireguard/pc/default.nix
View file

@ -1,22 +1,32 @@
{ config, ... }: { config, pkgs, ... }:
{ {
networking.firewall = { systemd.network = {
allowedUDPPorts = [ 51820 ]; enable = true;
}; netdevs = {
"10-wg0" = {
networking.wireguard.interfaces = { netdevConfig = {
"${config.ips.wgInt}" = { Kind = "wireguard";
# Define IP of client in per device config Name = "wg0";
listenPort = 51820; MTUBytes = 1300;
privateKey = config.secrets.wgClientPriv; };
peers = [ wireguardConfig = {
{ # 0.0.0.0 makes wg act like a traditional VPN PrivateKeyFile = pkgs.writeText "privkey" config.secrets.wgClientPriv;
publicKey = config.secrets.wgServerPub; ListenPort = 9918;
allowedIPs = [ "0.0.0.0/0" ]; };
endpoint = "sv.${config.secrets.jimDomain}:51820"; wireguardPeers = [
persistentKeepalive = 25; {
} PublicKey = config.secrets.wgServerPub;
]; AllowedIPs = [ "0.0.0.0/0" ];
Endpoint = "sv.${config.secrets.jimDomain}:51820";
}
];
};
};
networks.wg0 = {
matchConfig.Name = "wg0";
address = [ "10.100.0.19/24" ];
dns = [ "1.1.1.1" ];
gateway = [ "${config.ips.wgSpan}.1" ];
}; };
}; };
} }

4
modules/system/devices/networking/wireguard/server/default.nix
View file

@ -21,10 +21,6 @@
publicKey = config.secrets.wgPixel9Pub; publicKey = config.secrets.wgPixel9Pub;
allowedIPs = [ "${config.ips.wgSpan}.2/32" ]; allowedIPs = [ "${config.ips.wgSpan}.2/32" ];
} }
{ # Oracle VM
publicKey = config.secrets.wgOraclePub;
allowedIPs = [ "${config.ips.wgSpan}.3/32" ];
}
{ # General Nix { # General Nix
publicKey = config.secrets.wgClientPub; publicKey = config.secrets.wgClientPub;
allowedIPs = [ "${config.ips.wgSpan}.16/28" ]; allowedIPs = [ "${config.ips.wgSpan}.16/28" ];