From b096882d4aeb2f17a3d732ab0bbc3af903daef93 Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Wed, 14 Aug 2024 22:21:07 +0200
Subject: [PATCH] chore: add vm-simple-network to all eligible machines

---
 machines/core-data/default.nix     | 13 ++-----------
 machines/core-security/default.nix | 15 ++-------------
 machines/nuage/default.nix         | 14 ++------------
 machines/tower/default.nix         | 16 +++++++---------
 4 files changed, 13 insertions(+), 45 deletions(-)

diff --git a/machines/core-data/default.nix b/machines/core-data/default.nix
index 56d61ce..ee4f9b2 100644
--- a/machines/core-data/default.nix
+++ b/machines/core-data/default.nix
@@ -2,6 +2,7 @@
   pkgs,
   lib,
   inputs,
+  profiles,
   ...
 }:
 
@@ -15,6 +16,7 @@
     arch = "x86_64-linux";
     nixpkgs_version = inputs.nixpkgs;
     hm_version = inputs.home-manager;
+    profiles = with profiles; [ vm-simple-network ];
     ips = {
       public.ipv4 = "82.67.34.230";
       local.ipv4 = "192.168.0.66";
@@ -31,17 +33,6 @@
 
   luj.nginx.enable = true;
 
-  systemd.network.enable = true;
-
-  systemd.network.networks."10-wan" = {
-    matchConfig.Name = "ens18";
-    networkConfig = {
-      DHCP = "ipv4";
-      Address = "2a01:e0a:de4:a0e1:be24:11ff:fe09:638d";
-    };
-    linkConfig.RequiredForOnline = "routable";
-  };
-
   systemd.services.NetworkManager-wait-online.enable = lib.mkForce false;
   systemd.services.systemd-networkd-wait-online.enable = lib.mkForce false;
 
diff --git a/machines/core-security/default.nix b/machines/core-security/default.nix
index 7ac399b..91e75a3 100644
--- a/machines/core-security/default.nix
+++ b/machines/core-security/default.nix
@@ -3,6 +3,7 @@
   pkgs,
   lib,
   inputs,
+  profiles,
   ...
 }:
 
@@ -16,6 +17,7 @@
     arch = "x86_64-linux";
     nixpkgs_version = inputs.nixpkgs;
     hm_version = inputs.home-manager;
+    profiles = with profiles; [ vm-simple-network ];
     ips = {
       public.ipv4 = "82.67.34.230";
       local.ipv4 = "192.168.0.175";
@@ -31,19 +33,6 @@
 
   deployment.tags = [ "server" ];
 
-  systemd.network.enable = true;
-  systemd.network.networks."10-wan" = {
-    matchConfig.Name = "ens18";
-    networkConfig = {
-      # start a DHCP Client for IPv4 Addressing/Routing
-      DHCP = "ipv4";
-      # accept Router Advertisements for Stateless IPv6 Autoconfiguraton (SLAAC)
-      IPv6AcceptRA = true;
-    };
-    # make routing on this interface a dependency for network-online.target
-    linkConfig.RequiredForOnline = "routable";
-  };
-
   services.openssh.enable = true;
 
   systemd.services.systemd-networkd-wait-online.enable = lib.mkForce false;
diff --git a/machines/nuage/default.nix b/machines/nuage/default.nix
index 75f39a7..ab93c09 100644
--- a/machines/nuage/default.nix
+++ b/machines/nuage/default.nix
@@ -2,6 +2,7 @@
   config,
   pkgs,
   inputs,
+  profiles,
   ...
 }:
 
@@ -15,6 +16,7 @@
     arch = "x86_64-linux";
     nixpkgs_version = inputs.nixpkgs;
     hm_version = inputs.home-manager;
+    profiles = with profiles; [ vm-simple-network ];
     ips = {
       public.ipv4 = "82.67.34.230";
       local.ipv4 = "192.168.0.101";
@@ -22,7 +24,6 @@
       public.ipv6 = "2a01:e0a:de4:a0e1:95c9:b2e2:e999:1a45";
       vpn.ipv6 = "fd7a:115c:a1e0::1c";
     };
-
   };
 
   boot.loader.grub.enable = true;
@@ -33,17 +34,6 @@
 
   luj.nginx.enable = true;
 
-  systemd.network.enable = true;
-
-  systemd.network.networks."10-wan" = {
-    matchConfig.Name = "ens18";
-    networkConfig = {
-      DHCP = "ipv4";
-      Address = "2a01:e0a:de4:a0e1:95c9:b2e2:e999:1a45";
-    };
-    linkConfig.RequiredForOnline = "routable";
-  };
-
   services.mysql.enable = true;
   services.mysql.package = pkgs.mysql;
   services.nextcloud = {
diff --git a/machines/tower/default.nix b/machines/tower/default.nix
index 10bd912..e8e536c 100644
--- a/machines/tower/default.nix
+++ b/machines/tower/default.nix
@@ -1,4 +1,9 @@
-{ pkgs, inputs, ... }:
+{
+  pkgs,
+  inputs,
+  profiles,
+  ...
+}:
 
 {
   imports = [
@@ -11,6 +16,7 @@
     arch = "x86_64-linux";
     nixpkgs_version = inputs.nixpkgs;
     hm_version = inputs.home-manager;
+    profiles = with profiles; [ vm-simple-network ];
     ips = {
       public.ipv4 = "82.67.34.230";
       local.ipv4 = "192.168.0.103";
@@ -28,14 +34,6 @@
   networking.hostName = "tower";
 
   networking.useNetworkd = true;
-  systemd.network.networks."10-wan" = {
-    matchConfig.Name = "ens18";
-    networkConfig = {
-      DHCP = "ipv4";
-      Address = "2a01:e0a:de4:a0e1:8ec7:b5d2:f663:a67a";
-    };
-    linkConfig.RequiredForOnline = "routable";
-  };
 
   time.timeZone = "Europe/Paris";