From e8ebfb2e2a372ae13fea6a09ad25ead304f849c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 9 Apr 2024 12:27:37 +0200 Subject: [PATCH] drop custom systemd-networkd unit We no longer use multicast dns. This one doesn't conflict with nixos-generate-config. --- nixosModules/clanCore/networking.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/nixosModules/clanCore/networking.nix b/nixosModules/clanCore/networking.nix index a82a7469..2ad18425 100644 --- a/nixosModules/clanCore/networking.nix +++ b/nixosModules/clanCore/networking.nix @@ -74,22 +74,7 @@ systemd.services.NetworkManager-wait-online.enable = false; systemd.network.wait-online.enable = false; - # Provide a default network configuration but don't compete with network-manager or dhcpcd - systemd.network.networks."50-uplink" = - lib.mkIf (!(config.networking.networkmanager.enable || config.networking.dhcpcd.enable)) - { - matchConfig.Type = "ether"; - networkConfig = { - DHCP = "yes"; - LLDP = "yes"; - LLMNR = "yes"; - MulticastDNS = "yes"; - IPv6AcceptRA = "yes"; - }; - }; - # Use networkd instead of the pile of shell scripts networking.useNetworkd = lib.mkDefault true; - networking.useDHCP = lib.mkDefault false; }; }