flake.nix

@@ -12,14 +12,17 @@
   in {
 
     nixosModules = {
-      interactive-vm = import ./interactive-vm.nix;
+      ## Fediversity modules
-      mastodon = import ./mastodon.nix;
-      mastodon-vm = import ./mastodon-vm.nix;
-      peertube = import ./peertube.nix;
-      peertube-vm = import ./peertube-vm.nix;
-      pixelfed = import ./pixelfed.nix;
-      pixelfed-vm = import ./pixelfed-vm.nix;
       garage = import ./garage.nix;
+      mastodon = import ./mastodon.nix;
+      peertube = import ./peertube.nix;
+      pixelfed = import ./pixelfed.nix;
+
+      ## VM-specific modules
+      interactive-vm = import ./vm/interactive-vm.nix;
+      mastodon-vm = import ./vm/mastodon-vm.nix;
+      peertube-vm = import ./vm/peertube-vm.nix;
+      pixelfed-vm = import ./vm/pixelfed-vm.nix;
     };
 
     nixosConfigurations = {