diff --git a/infra/flake-part.nix b/infra/flake-part.nix
index 857848a..4e14e07 100644
--- a/infra/flake-part.nix
+++ b/infra/flake-part.nix
@@ -17,11 +17,7 @@
           };
           nixpkgs = inputs.nixpkgs;
           nixos.module = {
-            imports = [
-              ./vm02116/configuration.nix
-              ./vm02116/forgejo.nix
-              ./vm02116/hardware-configuration.nix
-            ];
+            imports = [ ./vm02116 ];
           };
         };
 
diff --git a/infra/vm02116/configuration.nix b/infra/vm02116/default.nix
similarity index 60%
rename from infra/vm02116/configuration.nix
rename to infra/vm02116/default.nix
index 3a4b6f0..09801fd 100644
--- a/infra/vm02116/configuration.nix
+++ b/infra/vm02116/default.nix
@@ -1,5 +1,8 @@
 {
-  imports = [ ../common ];
+  imports = [
+    ../common
+    ./forgejo.nix
+  ];
 
   procolix.vm = {
     name = "vm02116";
@@ -12,4 +15,14 @@
   ## two options can safely be removed.
   boot.initrd.availableKernelModules = [ "xen_blkfront" ];
   services.xe-guest-utilities.enable = true;
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/3802a66d-e31a-4650-86f3-b51b11918853";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/2CE2-1173";
+    fsType = "vfat";
+  };
 }
diff --git a/infra/vm02116/hardware-configuration.nix b/infra/vm02116/hardware-configuration.nix
deleted file mode 100644
index 5ad9e85..0000000
--- a/infra/vm02116/hardware-configuration.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/3802a66d-e31a-4650-86f3-b51b11918853";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/2CE2-1173";
-    fsType = "vfat";
-  };
-}