From e4c891b2845087196e5dd78b4e27537a8797ef4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20=E2=80=9CNiols=E2=80=9D=20Jeannerod?=
 <nicolas.jeannerod@moduscreate.com>
Date: Wed, 20 Nov 2024 17:22:55 +0100
Subject: [PATCH] Consolidate config for vm02186

---
 infra/flake-part.nix                                  |  6 +-----
 .../{hardware-configuration.nix => default.nix}       | 11 +++++++++++
 infra/vm02186/procolix-configuration.nix              |  9 ---------
 3 files changed, 12 insertions(+), 14 deletions(-)
 rename infra/vm02186/{hardware-configuration.nix => default.nix} (62%)
 delete mode 100644 infra/vm02186/procolix-configuration.nix

diff --git a/infra/flake-part.nix b/infra/flake-part.nix
index 58a83e1..8ead8c9 100644
--- a/infra/flake-part.nix
+++ b/infra/flake-part.nix
@@ -45,11 +45,7 @@
           };
           nixpkgs = inputs.nixpkgs;
           nixos.module = {
-            imports = [
-              ./vm02186/procolix-configuration.nix
-              ./vm02186/hardware-configuration.nix
-              ./vm02186/gitea-runner.nix
-            ];
+            imports = [ ./vm02186 ];
           };
         };
       };
diff --git a/infra/vm02186/hardware-configuration.nix b/infra/vm02186/default.nix
similarity index 62%
rename from infra/vm02186/hardware-configuration.nix
rename to infra/vm02186/default.nix
index c9538ea..cc93772 100644
--- a/infra/vm02186/hardware-configuration.nix
+++ b/infra/vm02186/default.nix
@@ -1,4 +1,15 @@
 {
+  imports = [
+    ../common
+    ./gitea-runner.nix
+  ];
+
+  procolix.vm = {
+    name = "vm02186";
+    ip4 = "185.206.232.186";
+    ip6 = "2a00:51c0:12:1201::186";
+  };
+
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/833ac0f9-ad8c-45ae-a9bf-5844e378c44a";
     fsType = "ext4";
diff --git a/infra/vm02186/procolix-configuration.nix b/infra/vm02186/procolix-configuration.nix
deleted file mode 100644
index 9cd4bf0..0000000
--- a/infra/vm02186/procolix-configuration.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  imports = [ ../common ];
-
-  procolix.vm = {
-    name = "vm02186";
-    ip4 = "185.206.232.186";
-    ip6 = "2a00:51c0:12:1201::186";
-  };
-}