mirrors_public/oddlama_nix-config
1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-11 07:10:39 +02:00
Code Activity

feat: modularize link renaming

Browse source
This commit is contained in:
oddlama 2023-05-11 01:28:31 +02:00
parent e8f50ab906
commit 14ef8ef877
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
10 changed files with 98 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hosts/ward/default.nix
View file

@ -27,12 +27,12 @@
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" "r8169"];
extra.microvms = let
macOffset = config.lib.net.mac.addPrivate nodeSecrets.networking.interfaces."wan-nic".mac;
macOffset = config.lib.net.mac.addPrivate nodeSecrets.networking.interfaces.lan.mac;
in {
test = {
autostart = true;
mac = macOffset "00:00:00:00:00:01";
macvtap = "wan";
mac = macOffset "00:00:00:00:00:11";
macvtap = "lan";
system = "x86_64-linux";
};
};

19
hosts/ward/microvms/test/default.nix
View file

@ -1,12 +1,4 @@
{
config,
inputs,
lib,
microvm,
nixos-hardware,
pkgs,
...
}: {
imports = [
../../../common/core
@ -14,15 +6,4 @@
];
home-manager.users.root.home.minimal = true;
systemd.network.networks = {
"10-wan" = {
# TODO
matchConfig.Name = "en*";
DHCP = "yes";
networkConfig.IPv6PrivacyExtensions = "kernel";
dhcpV4Config.RouteMetric = 20;
dhcpV6Config.RouteMetric = 20;
};
};
}

45
hosts/ward/net.nix
View file

@ -13,24 +13,12 @@ in {
boot.initrd.systemd.network = {
enable = true;
networks."10-wan" = {
DHCP = "yes";
#address = [
# "192.168.178.2/24"
# "fd00::1/64"
#];
#gateway = [
#];
matchConfig.MACAddress = nodeSecrets.networking.interfaces."wan-nic".mac;
networkConfig.IPv6PrivacyExtensions = "kernel";
dhcpV4Config.RouteMetric = 20;
dhcpV6Config.RouteMetric = 20;
};
networks = {inherit (config.systemd.network.networks) "10-wan";};
};
systemd.network.netdevs."10-wan" = {
systemd.network.netdevs."10-lan-self" = {
netdevConfig = {
Name = "wan";
Name = "lan-self";
Kind = "macvtap";
};
extraConfig = ''
@ -41,23 +29,13 @@ in {
systemd.network.networks = {
"10-lan" = {
address = [net.lan.ipv4cidr net.lan.ipv6cidr];
matchConfig.MACAddress = nodeSecrets.networking.interfaces.lan.mac;
networkConfig = {
IPForward = "yes";
IPv6PrivacyExtensions = "kernel";
};
dhcpV4Config.RouteMetric = 10;
dhcpV6Config.RouteMetric = 10;
};
"10-wan-nic" = {
matchConfig.MACAddress = nodeSecrets.networking.interfaces."wan-nic".mac;
extraConfig = ''
[Network]
MACVTAP=wan
MACVTAP=lan-self
'';
};
"11-wan" = {
"10-wan" = {
DHCP = "yes";
#address = [
# "192.168.178.2/24"
@ -65,11 +43,22 @@ in {
#];
#gateway = [
#];
matchConfig.Name = "wan";
matchConfig.MACAddress = nodeSecrets.networking.interfaces.wan.mac;
networkConfig.IPv6PrivacyExtensions = "kernel";
dhcpV4Config.RouteMetric = 20;
dhcpV6Config.RouteMetric = 20;
};
"11-lan-self" = {
address = [net.lan.ipv4cidr net.lan.ipv6cidr];
matchConfig.Name = "lan-self";
networkConfig = {
IPForward = "yes";
IPv6PrivacyExtensions = "kernel";
ConfigureWithoutCarrier = true;
};
dhcpV4Config.RouteMetric = 10;
dhcpV6Config.RouteMetric = 10;
};
};
networking.nftables.firewall = {

BIN
hosts/ward/secrets/secrets.nix.age
View file

Binary file not shown.