1
1
Fork 0
mirror of https://git.sr.ht/~rouven/nixos-config synced 2025-05-12 23:31:08 +02:00

fixes for nixos 24.11 checks

This commit is contained in:
Rouven Seifert 2024-06-10 10:21:00 +02:00
parent 53eb192ea8
commit d46d0737c5
7 changed files with 61 additions and 89 deletions
hosts
falkenstein/modules/networks
fujitsu/modules/networks
nuc/modules/networks
thinkpad/modules/networks

View file

@ -76,12 +76,10 @@
};
wireguardPeers = [
{
wireguardPeerConfig = {
PublicKey = "Z5lwwHTCDr6OF4lfaCdSHNveunOn4RzuOQeyB+El9mQ=";
PresharedKeyFile = config.age.secrets."wireguard/dorm/preshared".path;
Endpoint = "nuc.rfive.de:51820";
AllowedIPs = "192.168.42.0/24, 192.168.43.0/24";
};
PublicKey = "Z5lwwHTCDr6OF4lfaCdSHNveunOn4RzuOQeyB+El9mQ=";
PresharedKeyFile = config.age.secrets."wireguard/dorm/preshared".path;
Endpoint = "nuc.rfive.de:51820";
AllowedIPs = "192.168.42.0/24, 192.168.43.0/24";
}
];
};
@ -89,10 +87,8 @@
matchConfig.Name = "wg0";
addresses = [
{
addressConfig = {
Address = "192.168.43.4/24";
AddPrefixRoute = false;
};
Address = "192.168.43.4/24";
AddPrefixRoute = false;
}
];
networkConfig = {

View file

@ -32,13 +32,11 @@
networks."10-wired" = {
matchConfig.Name = "enp2s0";
address = [ "192.168.42.3/24" ];
routes = [{
routeConfig.Gateway = "192.168.42.1";
}];
networkConfig = {
DNS = [
"192.168.42.1"
];
Gateway = "192.168.42.1";
LLDP = true;
EmitLLDP = "nearest-bridge";
};

View file

@ -31,7 +31,7 @@
matchConfig.Name = "eno1";
address = [ "192.168.42.2/24" ];
routes = [{
routeConfig.Gateway = "192.168.42.1";
Gateway = "192.168.42.1";
}];
networkConfig = {
DNS = [

View file

@ -116,11 +116,9 @@
routes = [
# Route to the Model train network via raspi
{
routeConfig = {
Gateway = "192.168.178.63";
GatewayOnLink = true;
Destination = "192.168.179.0/24";
};
Gateway = "192.168.178.63";
GatewayOnLink = true;
Destination = "192.168.179.0/24";
}
];
};
@ -151,12 +149,10 @@
};
wireguardPeers = [
{
wireguardPeerConfig = {
PublicKey = "Z5lwwHTCDr6OF4lfaCdSHNveunOn4RzuOQeyB+El9mQ=";
PresharedKeyFile = config.age.secrets."wireguard/dorm/preshared".path;
Endpoint = "nuc.rfive.de:51820";
AllowedIPs = "192.168.42.0/24, 192.168.43.0/24";
};
PublicKey = "Z5lwwHTCDr6OF4lfaCdSHNveunOn4RzuOQeyB+El9mQ=";
PresharedKeyFile = config.age.secrets."wireguard/dorm/preshared".path;
Endpoint = "nuc.rfive.de:51820";
AllowedIPs = "192.168.42.0/24, 192.168.43.0/24";
}
];
};
@ -165,10 +161,8 @@
linkConfig.RequiredForOnline = false;
addresses = [
{
addressConfig = {
Address = "192.168.43.3/24";
AddPrefixRoute = false;
};
Address = "192.168.43.3/24";
AddPrefixRoute = false;
}
];
networkConfig = {
@ -191,7 +185,7 @@
source = "${pkgs.etherape}/bin/etherape";
capabilities = "cap_net_raw,cap_net_admin+eip";
owner = "root";
group = "etherape"; # too lazy to create a new one
group = "etherape";
permissions = "u+rx,g+x";
};
}