From 8a52d849bc02b74bfcf77d58c728c40f85ce36c1 Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen+git@mikaela.info>
Date: Tue, 30 Jul 2024 14:08:44 +0300
Subject: [PATCH] systemd-networkd: clean up lines I always clean up anyway

---
 etc/systemd/network/10-ether.network          | 28 +++++--------------
 .../10-ether.network.d/home-static.conf       |  8 ++----
 etc/systemd/network/10-wlan.network           | 26 +++--------------
 3 files changed, 14 insertions(+), 48 deletions(-)

diff --git a/etc/systemd/network/10-ether.network b/etc/systemd/network/10-ether.network
index c2241203..52130887 100644
--- a/etc/systemd/network/10-ether.network
+++ b/etc/systemd/network/10-ether.network
@@ -2,30 +2,16 @@
 Type=ether
 
 [Link]
-RequiredForOnline=false
-# If something else (like NetworkManager) manages network, uncomment
-#Unmanaged=true
-# Required for mDNS
-#Multicast=true
+# I always mask systemd-networkd-wait-online.service anyway, so everything can
+# be required for online if it wants to be.
+ActivationPolicy=always-up
+# Nothing else is managing addressing etc.
+Unmanaged=false
 
 [Network]
 DHCP=true
-# systemctl enable systemd-resolved && systemctl start systemd-resolved
-# ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
-DNS=
-DNS=::1
-DNS=127.0.0.1
-DNS=127.0.0.53
+IPv6PrivacyExtensions=true
+IPv6LinkLocalAddressGenerationMode=stable-privacy
 DNSSEC=true
-#DNSOverTLS=opportunistic
 DNSOverTLS=true
-# Search domains
 Domains=.
-# 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-ether.network.d/home-static.conf b/etc/systemd/network/10-ether.network.d/home-static.conf
index aad7fc01..546e6e9e 100644
--- a/etc/systemd/network/10-ether.network.d/home-static.conf
+++ b/etc/systemd/network/10-ether.network.d/home-static.conf
@@ -2,11 +2,9 @@
 # Dock MACAddress here?
 MACAddress=ff:ff:ff:ff:ff:ff
 
-[Link]
-RequiredForOnline=true
-# Takes "ipv4", "ipv6", "both", or "any" (default).
-#RequiredFamilyForOnline=both
-ActivationPolicy=always-up
+# Redunant for reading in the main file, but reminder never hurts?
+#[Link]
+#ActivationPolicy=always-up
 
 [Network]
 # /24, /16, /8 are the the class C, B, A networks
diff --git a/etc/systemd/network/10-wlan.network b/etc/systemd/network/10-wlan.network
index 2b1272ee..3f353b6d 100644
--- a/etc/systemd/network/10-wlan.network
+++ b/etc/systemd/network/10-wlan.network
@@ -1,35 +1,17 @@
 [Match]
-#Name=*
-# Can be {colon,hyphen,dot}-delimited hexadecimal or IPv{4,6} address
-#MACAddress=
 Type=wlan
 
 [Link]
-# Takes "ipv4", "ipv6", "both", or "any" (default).
-#RequiredFamilyForOnline=both
-# Always set administrative state to up. Implies RequiredForOnline=true
+# I always mask systemd-networkd-wait-online.service anyway, so everything can
+# be required for online if it wants to be.
 ActivationPolicy=always-up
-# If something else (like iwd EnableNetworkConfiguration=true) manages network,
-# uncomment
-#Unmanaged=true
-# Required for mDNS
-#Multicast=true
+# Nothing else is managing addressing etc.
+Unmanaged=false
 
 [Network]
 DHCP=true
 IPv6PrivacyExtensions=true
 IPv6LinkLocalAddressGenerationMode=stable-privacy
-DNS=
-DNS=::1
-DNS=127.0.0.1
-DNS=127.0.0.53
-# Enable mDNS/.local for systemd-resolved
-#MulticastDNS=true
-# Windows
-#LLMNR=true
-# systemd-resolved configuration
 DNSSEC=true
-#DNSOverTLS=opportunistic
 DNSOverTLS=true
-# Search domains
 Domains=.