diff options
| author | Mel <mel@rnrd.eu> | 2026-04-24 23:35:19 +0200 |
|---|---|---|
| committer | Mel <mel@rnrd.eu> | 2026-04-24 23:35:19 +0200 |
| commit | 56c22cf8ae9de73bbc1c37ce0b1635ae7af9be64 (patch) | |
| tree | 3ba1ca13dcf1ed9c0013f6bffddaee9392991b16 /machines/lapin | |
| parent | 127d8ff2c2e77a0cbfc7a2a3c962ef23b5ab7261 (diff) | |
| download | network-56c22cf8ae9de73bbc1c37ce0b1635ae7af9be64.tar.zst network-56c22cf8ae9de73bbc1c37ce0b1635ae7af9be64.zip | |
Migrate fully to systemd-networkd and nftables
Signed-off-by: Mel <mel@rnrd.eu>
Diffstat (limited to 'machines/lapin')
| -rw-r--r-- | machines/lapin/devices.nix | 41 | ||||
| -rw-r--r-- | machines/lapin/hardware.nix | 7 |
2 files changed, 11 insertions, 37 deletions
diff --git a/machines/lapin/devices.nix b/machines/lapin/devices.nix index 450baf3..239242a 100644 --- a/machines/lapin/devices.nix +++ b/machines/lapin/devices.nix @@ -15,18 +15,7 @@ memoryPercent = 50; }; - networking = { - # Network configuration is managed with networkd. - useDHCP = false; - nameservers = [ - "1.1.1.1" "1.0.0.1" - "2606:4700:4700::1111" "2606:4700:4700::1001" - ]; - }; - - # Static IPv6 network configuration - # + soliciting of IPv4 via DHCP. - systemd.network.enable = true; + # static ipv6 + dhcp ipv4 systemd.network.networks."10-wan" = { name = "enp1s0"; DHCP = "ipv4"; @@ -35,32 +24,24 @@ }; services.resolved = { - # LLMNR and MulticastDNS both give DNS timeouts. - # MDNS specifically for some reason gives Docker bridge interfaces it's scope, - # which means every DNS request waits for an answer... from every interface... + # llmnr and multicastdns both give dns timeouts. + # mdns specifically for some reason gives docker bridge interfaces it's scope, + # which means every dns request waits for an answer... from every interface... llmnr = "false"; extraConfig = "MulticastDNS=no"; - dnssec = "false"; # DNSSEC breaks IPv6, for some reason :( - }; - - virtualisation.docker.daemon.settings = { - "experimental" = true; - "ipv6" = true; - "ip6tables" = true; - "fixed-cidr-v6" = "fc00:d0c:b1b1::/48"; - "bip" = "172.17.0.1/24"; - "default-address-pools" = [ - { base = "172.17.0.0/16"; size = 24; } - { base = "fc00:d0c::/32"; size = 48; } - ]; + dnssec = "false"; # dnssec breaks ipv6, for some reason :( }; + fileSystems = { - # Mount the large-ish service state folder to a regrowable volume. :) + # mount the large-ish service state folder to a regrowable volume. :) "/srv" = { device = "/dev/disk/by-id/scsi-0HC_Volume_101611810"; fsType = "ext4"; - options = [ "defaults" "discard" ]; + options = [ + "defaults" + "discard" + ]; }; }; } diff --git a/machines/lapin/hardware.nix b/machines/lapin/hardware.nix index cc32191..4d07099 100644 --- a/machines/lapin/hardware.nix +++ b/machines/lapin/hardware.nix @@ -25,11 +25,4 @@ swapDevices = [ ]; - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; - } |