From 1b53634d0be0057d05045e58748670e293378120 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Wed, 2 Dec 2020 20:33:43 +0200
Subject: [PATCH] Rework network config

---
 config-root.yaml                             | 94 ++++++++++----------
 root/etc/systemd/network/01-wired.network    |  3 +-
 root/etc/systemd/network/02-usb0.network     |  3 +-
 root/etc/systemd/network/03-wireless.network |  3 +-
 root/etc/systemd/network/04-wlan0.network    |  3 +-
 root/etc/systemd/networkd.conf               |  3 +
 root/etc/systemd/resolved.conf               |  2 +
 7 files changed, 61 insertions(+), 50 deletions(-)
 create mode 100644 root/etc/systemd/networkd.conf
 create mode 100644 root/etc/systemd/resolved.conf

diff --git a/config-root.yaml b/config-root.yaml
index becfe0a..450e467 100644
--- a/config-root.yaml
+++ b/config-root.yaml
@@ -1,5 +1,3 @@
-actions:
-  chmod-wireguard: chmod 0640 /etc/systemd/network/99-wireguard.netdev
 config:
   backup: true
   banner: true
@@ -20,10 +18,11 @@ dotfiles:
     dst: /usr/local/bin
     src: usr/local/bin
   d_networkd:
-    actions:
-      - chmod-wireguard
     src: etc/systemd/network
     dst: /etc/systemd/network
+  f_networkd:
+    src: etc/systemd/networkd.conf
+    dst: /etc/systemd/networkd.conf
   f_99-sysctl.conf:
     dst: /etc/sysctl.d/99-sysctl.conf
     src: etc/sysctl.d/99-sysctl.conf
@@ -66,9 +65,6 @@ dotfiles:
   f_sshd_config:
     dst: /etc/ssh/sshd_config
     src: etc/ssh/sshd_config
-  f_timesyncd.conf:
-    dst: /etc/systemd/timesyncd.conf
-    src: etc/systemd/timesyncd.conf
   f_welcomemessage.conf:
     dst: /etc/welcomemessage.conf
     src: etc/welcomemessage.conf
@@ -132,58 +128,64 @@ dotfiles:
   f_pacserve.service.conf:
     src: etc/pacserve/pacserve.service.conf
     dst: /etc/pacserve/pacserve.service.conf
+  f_resolved.conf:
+    src: etc/systemd/resolved.conf
+    dst: /etc/systemd/resolved.conf
 profiles:
+  Network:
+    dotfiles:
+    - d_networkd
+    - f_resolved.conf
   Locale:
     dotfiles:
-      - f_locale.conf
-      - f_locale.gen
+    - f_locale.conf
+    - f_locale.gen
   Pacman:
     dotfiles:
-      - f_pacman.conf
-      - f_pacserve.service.conf
+    - f_pacman.conf
+    - f_pacserve.service.conf
   Mirkwood:
     dotfiles:
-      - f_getty.conf
-      - f_cryptissue
-      - f_welcomemessage.conf
-      - d_bin
-      - d_networkd
-      - f_adb.service
-      - f_bluetooth.conf
-      - f_iwd@.service
-      - f_sshd_config
-      - f_logind.conf
-      - f_60-uinput-permissions.rules
-      - f_freetype2.sh
-      - f_fonts.conf
-      - f_timesyncd.conf
-      - f_99-sysctl.conf
-      - f_99-lowbat.rules
-      - f_ignore
-      - f_mkinitcpio.conf
-      - f_vconsole.conf
-      - f_20-quiet-printk.conf
-      - f_system.conf
-      - f_cpupower
-      - f_arch.conf
-      - f_arch-lts.conf
-      - f_kodi.conf
-      - f_pacserve.service.conf
+    - f_getty.conf
+    - f_cryptissue
+    - f_welcomemessage.conf
+    - d_bin
+    - f_adb.service
+    - f_bluetooth.conf
+    - f_iwd@.service
+    - f_sshd_config
+    - f_logind.conf
+    - f_60-uinput-permissions.rules
+    - f_freetype2.sh
+    - f_fonts.conf
+    - f_99-sysctl.conf
+    - f_99-lowbat.rules
+    - f_ignore
+    - f_mkinitcpio.conf
+    - f_vconsole.conf
+    - f_20-quiet-printk.conf
+    - f_system.conf
+    - f_cpupower
+    - f_arch.conf
+    - f_arch-lts.conf
+    - f_kodi.conf
+    - f_pacserve.service.conf
     include:
-      - Locale
-      - Pacman
+    - Locale
+    - Pacman
+    - Network
   Moria:
     include:
-      - Locale
-      - Pacman
+    - Locale
+    - Pacman
     dotfiles:
-      - f_sshd_config
-      - f_99-sysctl.conf
+    - f_sshd_config
+    - f_99-sysctl.conf
   Gondor:
     include:
-      - Locale
+    - Locale
     dotfiles:
-      - f_sshd_config
+    - f_sshd_config
   localhost:
     include:
-      - Locale
+    - Locale
diff --git a/root/etc/systemd/network/01-wired.network b/root/etc/systemd/network/01-wired.network
index de6a082..92ec5d6 100644
--- a/root/etc/systemd/network/01-wired.network
+++ b/root/etc/systemd/network/01-wired.network
@@ -2,7 +2,8 @@
 Name=enp*
 
 [Network]
-DHCP=ipv4
+DHCP=yes
 
 [DHCP]
 RouteMetric=10
+UseDomains=true
diff --git a/root/etc/systemd/network/02-usb0.network b/root/etc/systemd/network/02-usb0.network
index 29b43b0..8ae4432 100644
--- a/root/etc/systemd/network/02-usb0.network
+++ b/root/etc/systemd/network/02-usb0.network
@@ -2,7 +2,8 @@
 Name=usb0
 
 [Network]
-DHCP=ipv4
+DHCP=yes
 
 [DHCP]
 RouteMetric=10
+UseDomains=true
diff --git a/root/etc/systemd/network/03-wireless.network b/root/etc/systemd/network/03-wireless.network
index 3c39f95..94b6271 100644
--- a/root/etc/systemd/network/03-wireless.network
+++ b/root/etc/systemd/network/03-wireless.network
@@ -2,7 +2,8 @@
 Name=wlp*
 
 [Network]
-DHCP=ipv4
+DHCP=yes
 
 [DHCP]
 RouteMetric=20
+UseDomains=true
diff --git a/root/etc/systemd/network/04-wlan0.network b/root/etc/systemd/network/04-wlan0.network
index 16e7cfb..6252119 100644
--- a/root/etc/systemd/network/04-wlan0.network
+++ b/root/etc/systemd/network/04-wlan0.network
@@ -2,7 +2,8 @@
 Name=wlan0
 
 [Network]
-DHCP=ipv4
+DHCP=yes
 
 [DHCP]
 RouteMetric=20
+UseDomains=true
diff --git a/root/etc/systemd/networkd.conf b/root/etc/systemd/networkd.conf
new file mode 100644
index 0000000..966d4b5
--- /dev/null
+++ b/root/etc/systemd/networkd.conf
@@ -0,0 +1,3 @@
+[Network]
+SpeedMeter=yes
+SpeedMeterIntervalSec=10sec
diff --git a/root/etc/systemd/resolved.conf b/root/etc/systemd/resolved.conf
new file mode 100644
index 0000000..ad4ea0b
--- /dev/null
+++ b/root/etc/systemd/resolved.conf
@@ -0,0 +1,2 @@
+[Resolve]
+LLMNR=no