e63cee7b09
river's WAN moves to a PPPoE session (Digiweb, over VLAN 10 with baby-jumbo 1508 MTU) driven by pppd, with its ip-up/ip-down hooks toggling a new wan-online.target. stream keeps its DHCP WAN, so the existing 50-wan / 50-wan-ifb networkd config moves out of routing-common into stream, and the shared consumers (ipsec, ipv6-clear-default-route) now attach to wan-online.target instead of depending on systemd-networkd-wait-online@wan directly. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
209 lines
5.9 KiB
Nix
209 lines
5.9 KiB
Nix
{
|
|
imports = [ (import ./routing-common 1) ];
|
|
|
|
config.nixos.systems.stream = {
|
|
system = "x86_64-linux";
|
|
nixpkgs = "mine";
|
|
home-manager = "mine";
|
|
|
|
configuration = { lib, pkgs, config, assignments, ... }:
|
|
let
|
|
inherit (lib) mkMerge;
|
|
inherit (lib.my) networkdAssignment;
|
|
inherit (lib.my.c) networkd;
|
|
in
|
|
{
|
|
imports = [ ./routing-common/mstpd.nix ];
|
|
|
|
config = {
|
|
boot = {
|
|
kernelModules = [ "kvm-intel" ];
|
|
kernelParams = [ "intel_iommu=on" ];
|
|
initrd.availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
|
|
};
|
|
|
|
hardware = {
|
|
enableRedistributableFirmware = true;
|
|
cpu = {
|
|
intel.updateMicrocode = true;
|
|
};
|
|
};
|
|
|
|
fileSystems = {
|
|
"/boot" = {
|
|
device = "/dev/disk/by-partuuid/fe081885-9157-46b5-be70-46ac6fcb4069";
|
|
fsType = "vfat";
|
|
};
|
|
"/nix" = {
|
|
device = "/dev/disk/by-partuuid/a195e55e-397f-440d-a190-59ffa63cdb3f";
|
|
fsType = "ext4";
|
|
};
|
|
"/persist" = {
|
|
device = "/dev/disk/by-partuuid/ad71fafd-2d26-49c8-b0cb-794a28e0beb7";
|
|
fsType = "ext4";
|
|
neededForBoot = true;
|
|
};
|
|
};
|
|
|
|
services = {
|
|
mjpg-streamer = {
|
|
enable = false;
|
|
inputPlugin = "input_uvc.so";
|
|
outputPlugin = "output_http.so -w @www@ -n -p 5050";
|
|
};
|
|
octoprint = {
|
|
enable = false;
|
|
host = "::";
|
|
extraConfig = {
|
|
plugins = {
|
|
classicwebcam = {
|
|
snapshot = "/webcam/?action=snapshot";
|
|
stream = "/webcam/?action=stream";
|
|
streamRatio = "4:3";
|
|
};
|
|
};
|
|
serial = {
|
|
port = "/dev/ttyACM0";
|
|
baudrate = 115200;
|
|
};
|
|
temperature.profiles = [
|
|
{
|
|
bed = 60;
|
|
extruder = 215;
|
|
name = "PLA";
|
|
}
|
|
];
|
|
};
|
|
};
|
|
};
|
|
|
|
# WAN is a plain networkd-managed DHCP link here; gate the shared wan-online
|
|
# target on networkd reporting it online.
|
|
systemd.targets.wan-online = {
|
|
requires = [ "systemd-networkd-wait-online@wan.service" ];
|
|
after = [ "systemd-networkd-wait-online@wan.service" ];
|
|
wantedBy = [ "multi-user.target" ];
|
|
};
|
|
|
|
systemd.network = {
|
|
netdevs = {
|
|
"25-lan" = {
|
|
netdevConfig = {
|
|
Name = "lan";
|
|
Kind = "bridge";
|
|
};
|
|
extraConfig = ''
|
|
[Bridge]
|
|
STP=true
|
|
'';
|
|
};
|
|
};
|
|
links = {
|
|
"10-wan" = {
|
|
matchConfig = {
|
|
# Matching against MAC address seems to break VLAN interfaces
|
|
# (since they share the same MAC address)
|
|
Driver = "igc";
|
|
PermanentMACAddress = "00:f0:cb:ee:ca:dd";
|
|
};
|
|
linkConfig = {
|
|
Name = "wan";
|
|
RxBufferSize = 4096;
|
|
TxBufferSize = 4096;
|
|
};
|
|
};
|
|
"10-lan-jim" = {
|
|
matchConfig = {
|
|
Driver = "igc";
|
|
PermanentMACAddress = "00:f0:cb:ee:ca:de";
|
|
};
|
|
linkConfig = {
|
|
Name = "lan-jim";
|
|
MTUBytes = toString lib.my.c.home.hiMTU;
|
|
};
|
|
};
|
|
"10-et2" = {
|
|
matchConfig = {
|
|
Driver = "igc";
|
|
PermanentMACAddress = "00:f0:cb:ee:ca:df";
|
|
};
|
|
linkConfig.Name = "et2";
|
|
};
|
|
|
|
"10-lan-dave" = {
|
|
matchConfig = {
|
|
Driver = "mlx4_en";
|
|
PermanentMACAddress = "00:02:c9:d5:b1:d6";
|
|
};
|
|
linkConfig = {
|
|
Name = "lan-dave";
|
|
MTUBytes = toString lib.my.c.home.hiMTU;
|
|
};
|
|
};
|
|
"10-et5" = {
|
|
matchConfig = {
|
|
Driver = "mlx4_en";
|
|
PermanentMACAddress = "00:02:c9:d5:b1:d7";
|
|
};
|
|
linkConfig.Name = "et5";
|
|
};
|
|
};
|
|
networks = {
|
|
"50-lan-jim" = {
|
|
matchConfig.Name = "lan-jim";
|
|
networkConfig.Bridge = "lan";
|
|
};
|
|
"50-lan-dave" = {
|
|
matchConfig.Name = "lan-dave";
|
|
networkConfig.Bridge = "lan";
|
|
};
|
|
|
|
"50-wan-ifb" = {
|
|
matchConfig.Name = "wan-ifb";
|
|
networkConfig = networkd.noL3;
|
|
extraConfig = ''
|
|
[CAKE]
|
|
Bandwidth=490M
|
|
RTTSec=50ms
|
|
PriorityQueueingPreset=besteffort
|
|
# DOCSIS preset
|
|
OverheadBytes=18
|
|
MPUBytes=64
|
|
CompensationMode=none
|
|
'';
|
|
};
|
|
"50-wan" = mkMerge [
|
|
(networkdAssignment "wan" assignments.modem)
|
|
{
|
|
matchConfig.Name = "wan";
|
|
DHCP = "ipv4";
|
|
dns = [ "127.0.0.1" "::1" ];
|
|
dhcpV4Config.UseDNS = false;
|
|
|
|
qdiscConfig = {
|
|
Parent = "ingress";
|
|
Handle = "0xffff";
|
|
};
|
|
extraConfig = ''
|
|
[CAKE]
|
|
Parent=root
|
|
Bandwidth=48M
|
|
RTTSec=50ms
|
|
'';
|
|
}
|
|
];
|
|
};
|
|
};
|
|
|
|
my = {
|
|
secrets = {
|
|
key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPYTB4zeAqotrEJ8M+AiGm/s9PFsWlAodz3hYSROGuDb";
|
|
};
|
|
server.enable = true;
|
|
# deploy.node.hostname = "192.168.68.2";
|
|
};
|
|
};
|
|
};
|
|
};
|
|
}
|