Bun/nixos-config
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update Wireguard client also

Browse source
This commit is contained in:
Bun 2025-04-16 22:14:31 -04:00
parent 08827b5d5d
commit 48a2e3211d
12 changed files with 128 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosts/midas/default.nix
View file

@ -4,8 +4,8 @@
./boot
./disko
./filesystems
./firewall
./hardware
./network
./services
./users
../../modules/system

28
hosts/midas/firewall/default.nix
View file

@ -1,28 +0,0 @@
{ ... }:
{
networking.nftables.tables.forwarding = {
family = "inet";
content = ''
chain incoming {
type nat hook prerouting priority dstnat; policy accept;
tcp dport 2211 dnat ip to 11.0.0.100:22 comment "Tower SSH"
tcp dport 2222 dnat ip to 11.0.0.2:22 comment "Kitty SSH"
tcp dport 2233 dnat ip to 11.0.0.101:22 comment "Envy SSH"
tcp dport 2244 dnat ip to 11.0.0.102:22 comment "Intuos SSH"
udp dport { 27005, 27015 } dnat ip to 11.0.0.100 comment "PC Hosted Games"
tcp dport { 48010, 47989, 47984 } dnat ip to 11.0.0.100 comment "PC Sunshine TCP"
udp dport { 47998, 47999, 48000 } dnat ip to 11.0.0.100 comment "PC Sunshine UDP"
}
chain forward {
type nat hook postrouting priority 100; policy accept;
masquerade
}
'';
};
# Enable IP forwarding for the server configuration
boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
}

38
hosts/midas/network/default.nix Normal file
View file

@ -0,0 +1,38 @@
{ ... }:
{
networking = {
interfaces."eno1".ipv4.addresses = [{
address = "10.2.0.1";
prefixLength = 8;
}];
defaultGateway = {
address = "10.1.0.1";
interface = "eno1";
};
nftables.tables.forwarding = {
family = "inet";
content = ''
chain incoming {
type nat hook prerouting priority dstnat; policy accept;
tcp dport 2211 dnat ip to 11.0.0.100:22 comment "Tower SSH"
tcp dport 2222 dnat ip to 11.0.0.2:22 comment "Kitty SSH"
tcp dport 2233 dnat ip to 11.0.0.101:22 comment "Envy SSH"
tcp dport 2244 dnat ip to 11.0.0.102:22 comment "Intuos SSH"
udp dport { 27005, 27015 } dnat ip to 11.0.0.100 comment "PC Hosted Games"
tcp dport { 48010, 47989, 47984 } dnat ip to 11.0.0.100 comment "PC Sunshine TCP"
udp dport { 47998, 47999, 48000 } dnat ip to 11.0.0.100 comment "PC Sunshine UDP"
}
chain forward {
type nat hook postrouting priority 100; policy accept;
masquerade
}
'';
};
};
# Enable IP forwarding for the server configuration
boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
}

2
hosts/midas/services/default.nix
View file

@ -17,7 +17,7 @@
trilium-server.enable = true;
vaultwarden.enable = true;
webserver.enable = true;
wireguard.server.enable = true;
wg.server.enable = true;
minecraft-servers = {
enable = true;

16
hosts/tower/default.nix
View file

@ -4,23 +4,13 @@
./boot
./disko
./filesystems
./firewall
./hardware
./network
./users
../../modules/system
];
networking = {
hostName = "tower";
vlans.internal = {
id=100;
interface="enp42s0";
};
interfaces.internal.ipv4.addresses = [{
address = "11.0.0.100";
prefixLength = 8;
}];
};
networking.hostName = "tower";
system = {
desktop.enable = true;
@ -28,5 +18,7 @@
stateVersion = "24.05";
};
services.wg.client.enable = true;
virtualisation.libvirtd.enable = true;
}

4
hosts/tower/firewall/default.nix
View file

@ -1,4 +0,0 @@
{ ... }:
{
networking.firewall.allowedUDPPorts = [ 27015 ];
}

15
hosts/tower/network/default.nix Normal file
View file

@ -0,0 +1,15 @@
{ ... }:
{
networking.firewall.allowedUDPPorts = [ 27015 ];
systemd.network = {
netdevs."10-wg0".wireguardPeers = [
{ # Local server
PublicKey = "qnOT/lXOJMaQgDUdXpyfGZB2IEyUouRje2m/bCe9ux8=";
AllowedIPs = [ "11.0.0.0/8" ];
Endpoint = "10.2.0.1:51820";
}
];
networks."wg0".address = [ "11.0.0.100/8" ];
};
}

1
modules/system/services/general/default.nix
View file

@ -12,5 +12,6 @@
./sunshine
./tlp
./userborn
./wireguard
];
}

28
modules/system/services/general/wireguard/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ config, lib, pkgs, ... }:
{
options.services.wg.client.enable = lib.mkEnableOption "Enable Wireguard client";
config = lib.mkIf config.services.wg.client.enable {
boot.kernelModules = [ "wireguard" ];
systemd.network = {
netdevs = {
"10-wg0" = {
netdevConfig = {
Kind = "wireguard";
Name = "wg0";
MTUBytes = "1300";
};
wireguardConfig = {
PrivateKeyFile = pkgs.writeText "wgclientsecret" config.secrets.wg.clientKey;
ListenPort = 9918;
};
};
};
networks."wg0" = {
matchConfig.Name = "wg0";
DHCP = "no";
};
};
};
}

14
modules/system/services/server/wireguard/client/default.nix
View file

@ -1,14 +0,0 @@
{ config, lib, ... }:
{
networking.wg-quick.interfaces.wgc = lib.mkIf config.services.wireguard.client.enable {
privateKey = config.secrets.wg.clientKey;
peers = [
{ # Home server
publicKey = "qnOT/lXOJMaQgDUdXpyfGZB2IEyUouRje2m/bCe9ux8=";
allowedIPs = [ "11.0.0.0/8" ];
endpoint = "sv.nixfox.ca:51820";
persistentKeepalive = 25;
}
];
};
}

48
modules/system/services/server/wireguard/default.nix
View file

@ -1,12 +1,44 @@
{ lib, ... }:
{ config, lib, pkgs, ... }:
{
imports = [
./client
./server
];
options.services.wg.server.enable = lib.mkEnableOption "Enable Wireguard server";
options.services.wireguard = with lib; {
client.enable = mkEnableOption "Enable Wireguard client";
server.enable = mkEnableOption "Enable Wireguard server";
config = lib.mkIf config.services.wg.server.enable {
systemd.network = {
netdevs = {
"50-wg0" = {
netdevConfig = {
Kind = "wireguard";
Name = "wg0";
MTUBytes = "1300";
};
wireguardConfig = {
PrivateKeyFile = pkgs.writeText "wgserversecret" config.secrets.wg.serverKey;
ListenPort = 51820;
RouteTable = "main";
};
wireguardPeers = [
{ # NixOS Config Key
PublicKey = "OKUH/h6YSURI4vgeTZKQD15QsqaygdbTn1mAWzQp9S0=";
AllowedIPs = [ "11.0.0.0/8" ];
}
{ # Pixel 9
PublicKey = "dPCtjm67adMZCnyL1O2L+uUOk0RbjA9T/tht1r+qcE4=";
AllowedIPs = [ "11.1.0.1/32" ];
}
];
};
};
networks."wg0" = {
matchConfig.Name = "wg0";
address = [ "11.0.0.1/8" ];
networkConfig = {
IPMasquerade = "both";
IPv4Forwarding = true;
IPv6Forwarding = true;
};
};
};
networking.firewall.allowedUDPPorts = [ 51820 ];
};
}

42
modules/system/services/server/wireguard/server/default.nix
View file

@ -1,42 +0,0 @@
{ config, lib, pkgs, ... }:
{
config = lib.mkIf config.services.wireguard.server.enable {
systemd.network = {
netdevs = {
"50-wg0" = {
netdevConfig = {
Kind = "wireguard";
Name = "wg0";
MTUBytes = "1300";
};
wireguardConfig = {
PrivateKeyFile = pkgs.writeText "wgserversecret" config.secrets.wg.serverKey;
ListenPort = 51820;
RouteTable = "main";
};
wireguardPeers = [
{ # NixOS Config Key
PublicKey = "OKUH/h6YSURI4vgeTZKQD15QsqaygdbTn1mAWzQp9S0=";
AllowedIPs = [ "11.0.0.0/8" ];
}
{ # Pixel 9
PublicKey = "dPCtjm67adMZCnyL1O2L+uUOk0RbjA9T/tht1r+qcE4=";
AllowedIPs = [ "11.1.0.1/32" ];
}
];
};
};
networks.wg0 = {
matchConfig.Name = "wg0";
address = [ "11.0.0.1/8" ];
networkConfig = {
IPMasquerade = "both";
IPv4Forwarding = true;
IPv6Forwarding = true;
};
};
};
networking.firewall.allowedUDPPorts = [ 51820 ];
};
}