From b35f099fe2bf8d2d55c245278646b3958cf70cfe Mon Sep 17 00:00:00 2001
From: Lin Yinfeng <lin.yinfeng@outlook.com>
Date: Wed, 2 Aug 2023 22:03:26 +0800
Subject: [PATCH] hosts/enchilada: fix iproute2

---
 flake/hosts.nix                                | 2 ++
 nixos/hosts/enchilada/default.nix              | 1 -
 nixos/hosts/fsn0/default.nix                   | 1 -
 nixos/hosts/hil0/default.nix                   | 1 -
 nixos/hosts/hkg0/default.nix                   | 1 -
 nixos/hosts/mia0/default.nix                   | 1 -
 nixos/hosts/mtl0/default.nix                   | 1 -
 nixos/hosts/shg0/default.nix                   | 1 -
 nixos/profiles/networking/iproute2/default.nix | 4 ++++
 nixos/profiles/networking/networkd/default.nix | 4 ++++
 10 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 nixos/profiles/networking/iproute2/default.nix
 create mode 100644 nixos/profiles/networking/networkd/default.nix

diff --git a/flake/hosts.nix b/flake/hosts.nix
index 97fa026ba..34c7b1b62 100644
--- a/flake/hosts.nix
+++ b/flake/hosts.nix
@@ -29,6 +29,8 @@
       ]);
 
     network = with profiles; [
+      networking.networkd
+      networking.iproute2
       networking.firewall
       networking.avahi
       networking.resolved
diff --git a/nixos/hosts/enchilada/default.nix b/nixos/hosts/enchilada/default.nix
index 542c564d2..20044f4b2 100644
--- a/nixos/hosts/enchilada/default.nix
+++ b/nixos/hosts/enchilada/default.nix
@@ -26,7 +26,6 @@
     # TODO broken
     # mobile.boot.stage-1.usb.features = ["rndis"];
     # manual rndis setup
-    networking.useNetworkd = true;
     systemd.services.setup-rndis = {
       script = ''
         cd /sys/kernel/config/usb_gadget/g1
diff --git a/nixos/hosts/fsn0/default.nix b/nixos/hosts/fsn0/default.nix
index b34529f4a..78dfb2ab9 100644
--- a/nixos/hosts/fsn0/default.nix
+++ b/nixos/hosts/fsn0/default.nix
@@ -116,7 +116,6 @@
 
     # networking
     (lib.mkIf (!config.system.is-vm) {
-      networking.useNetworkd = true;
       environment.etc."systemd/network/45-enp1s0.network".source =
         config.sops.templates."enp1s0".path;
       sops.templates."enp1s0" = {
diff --git a/nixos/hosts/hil0/default.nix b/nixos/hosts/hil0/default.nix
index 0e3e2fa0c..7a08dead0 100644
--- a/nixos/hosts/hil0/default.nix
+++ b/nixos/hosts/hil0/default.nix
@@ -93,7 +93,6 @@ in {
 
     # networking
     (lib.mkIf (!config.system.is-vm) {
-      networking.useNetworkd = true;
       environment.etc."systemd/network/45-enp1s0.network".source =
         config.sops.templates."enp1s0".path;
       sops.templates."enp1s0" = {
diff --git a/nixos/hosts/hkg0/default.nix b/nixos/hosts/hkg0/default.nix
index ac58f3e72..a835cb0b8 100644
--- a/nixos/hosts/hkg0/default.nix
+++ b/nixos/hosts/hkg0/default.nix
@@ -42,7 +42,6 @@ in {
     }
 
     (lib.mkIf (!config.system.is-vm) {
-      networking.useNetworkd = true;
       systemd.network.networks."40-ens3" = {
         matchConfig = {
           Name = "ens3";
diff --git a/nixos/hosts/mia0/default.nix b/nixos/hosts/mia0/default.nix
index a52bd7694..0d3906cab 100644
--- a/nixos/hosts/mia0/default.nix
+++ b/nixos/hosts/mia0/default.nix
@@ -81,7 +81,6 @@ in {
 
     {
       networking = lib.mkIf (!config.system.is-vm) {
-        useNetworkd = true;
         interfaces.ens3.useDHCP = true;
       };
     }
diff --git a/nixos/hosts/mtl0/default.nix b/nixos/hosts/mtl0/default.nix
index b7dca94fc..b3b34b8ed 100644
--- a/nixos/hosts/mtl0/default.nix
+++ b/nixos/hosts/mtl0/default.nix
@@ -78,7 +78,6 @@ in {
     }
 
     (lib.mkIf (!config.system.is-vm) {
-      networking.useNetworkd = true;
       environment.etc."systemd/network/45-enX0.network".source =
         config.sops.templates."enX0".path;
       sops.secrets."network/address" = {
diff --git a/nixos/hosts/shg0/default.nix b/nixos/hosts/shg0/default.nix
index 4910cb8a4..460c66924 100644
--- a/nixos/hosts/shg0/default.nix
+++ b/nixos/hosts/shg0/default.nix
@@ -139,7 +139,6 @@ in {
 
     {
       networking = lib.mkIf (!config.system.is-vm) {
-        useNetworkd = true;
         interfaces.ens5.useDHCP = true;
       };
     }
diff --git a/nixos/profiles/networking/iproute2/default.nix b/nixos/profiles/networking/iproute2/default.nix
new file mode 100644
index 000000000..1ef42e75d
--- /dev/null
+++ b/nixos/profiles/networking/iproute2/default.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  networking.iproute2.enable = true;
+}
diff --git a/nixos/profiles/networking/networkd/default.nix b/nixos/profiles/networking/networkd/default.nix
new file mode 100644
index 000000000..db5c722b9
--- /dev/null
+++ b/nixos/profiles/networking/networkd/default.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  networking.useNetworkd = true;
+}