From 945ca0462df6714e87484ffa7f953e4e8113cac3 Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen+git@mikaela.info>
Date: Mon, 22 Apr 2024 12:21:56 +0300
Subject: [PATCH] Revert "systemd-networkd: attempt to deduplicate by cutting
 into 10-global.network"

This reverts commit 19b6fbef3c2470bbdd9236d1bc1d2998d6893991.
---
 etc/systemd/network/10-ether.network  | 21 ++++++++++++++++--
 etc/systemd/network/10-global.network | 32 ---------------------------
 etc/systemd/network/10-wlan.network   |  6 +++++
 3 files changed, 25 insertions(+), 34 deletions(-)
 delete mode 100644 etc/systemd/network/10-global.network

diff --git a/etc/systemd/network/10-ether.network b/etc/systemd/network/10-ether.network
index 762e7788..c313278a 100644
--- a/etc/systemd/network/10-ether.network
+++ b/etc/systemd/network/10-ether.network
@@ -1,4 +1,5 @@
 [Match]
+#Name=*
 # Can be {colon,hyphen,dot}-delimited hexadecimal or IPv{4,6} address
 #MACAddress=
 Type=ether
@@ -11,11 +12,27 @@ RequiredForOnline=false
 RequiredFamilyForOnline=both
 # Always set administrative state to up. Implies RequiredForOnline=true
 #ActivationPolicy=always-up
+# Required for mDNS
+Multicast=true
 
 [Network]
 #DHCP=true
 # /24, /16, /8 are the the class C, B, A networks
 Address=192.168.0.2/24
 Gateway=192.168.0.1
-#DNS=
-#NTP=
+IPv6PrivacyExtensions=true
+IPv6LinkLocalAddressGenerationMode=stable-privacy
+# DNS has no effect unless systemd-resolved is used. Why would it be used?
+# systemctl enable systemd-resolved && systemctl start systemd-resolved
+# ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
+#DNS=127.0.0.1
+#DNS=::1
+#DNS=8.8.4.4
+# Enable systemd-timesyncd with `timedatectl set-ntp true`, may be specified
+# multiple times, but you are using Chrony instead, right?
+#NTP=fi.pool.ntp.org
+#NTP=time.cloudflare.com
+# Enable mDNS/.local for systemd-resolved
+MulticastDNS=true
+# Windows
+LLMNR=true
diff --git a/etc/systemd/network/10-global.network b/etc/systemd/network/10-global.network
deleted file mode 100644
index b583b6be..00000000
--- a/etc/systemd/network/10-global.network
+++ /dev/null
@@ -1,32 +0,0 @@
-[Match]
-Name=*
-
-[Link]
-# required for mDNS
-Multicast=true
-
-[Network]
-# Enable privacy extensions
-IPv6PrivacyExtensions=true
-IPv6LinkLocalAddressGenerationMode=stable-privacy
-# systemd-resolved configuration
-DNSSEC=true
-#DNSSEC=allow-downgrade
-DNSOverTLS=true
-#DNSOverTLS=opportunistic
-# Search domains
-Domains=.
-# Enable mDNS/.local for systemd-resolved
-MulticastDNS=true
-# Windows
-LLMNR=true
-# DNS has no effect unless systemd-resolved is used. Why would it be used?
-# systemctl enable systemd-resolved && systemctl start systemd-resolved
-# ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
-#DNS=127.0.0.1
-#DNS=::1
-#DNS=8.8.4.4
-# Enable systemd-timesyncd with `timedatectl set-ntp true`, may be specified
-# multiple times, but you are using Chrony instead, right?
-#NTP=fi.pool.ntp.org
-#NTP=time.cloudflare.com
diff --git a/etc/systemd/network/10-wlan.network b/etc/systemd/network/10-wlan.network
index a0962fb8..839ce67a 100644
--- a/etc/systemd/network/10-wlan.network
+++ b/etc/systemd/network/10-wlan.network
@@ -17,3 +17,9 @@ Multicast=true
 
 [Network]
 DHCP=true
+IPv6PrivacyExtensions=true
+IPv6LinkLocalAddressGenerationMode=stable-privacy
+# Enable mDNS/.local for systemd-resolved
+MulticastDNS=true
+# Windows
+LLMNR=true