nixosModules: refactor and always use pixelfed from lock

fediversity/pixelfed.nix

@@ -59,7 +59,4 @@ lib.mkIf (config.fediversity.enable && config.fediversity.pixelfed.enable) {
     after = [ "ensure-garage.service" ];
   };
 
-  services.pixelfed.package = pkgs.pixelfed.overrideAttrs (old: {
-    patches = (old.patches or [ ]) ++ [ ./pixelfed-group-permissions.patch ];
-  });
 }

flake.nix

@@ -13,13 +13,39 @@
 
     nixosModules = {
       ## Fediversity modules
-      fediversity = ./fediversity;
+      fediversity = {
+        imports = [ ./fediversity ];
+
+        services.pixelfed.package = pkgs.pixelfed.overrideAttrs (old: {
+          patches = (old.patches or [ ]) ++ [ ./fediversity/pixelfed-group-permissions.patch ];
+        });
+      };
 
       ## VM-specific modules
-      interactive-vm = ./vm/interactive-vm.nix;
+      interactive-vm = {
-      mastodon-vm = ./vm/mastodon-vm.nix;
+        imports = [
-      peertube-vm = ./vm/peertube-vm.nix;
+          ./vm/interactive-vm.nix
-      pixelfed-vm = ./vm/pixelfed-vm.nix;
+          self.nixosModules.fediversity
+        ];
+      };
+      mastodon-vm = {
+        imports = [
+          ./vm/mastodon-vm.nix
+          self.nixosModules.fediversity
+        ];
+      };
+      peertube-vm = {
+        imports = [
+          ./vm/peertube-vm.nix
+          self.nixosModules.fediversity
+        ];
+      };
+      pixelfed-vm = {
+        imports = [
+          ./vm/pixelfed-vm.nix
+          self.nixosModules.fediversity
+        ];
+      };
     };
 
     nixosConfigurations = {

vm/mastodon-vm.nix

@@ -1,7 +1,6 @@
 { modulesPath, lib, config, ... }: {
 
   imports = [
-    ../fediversity
     (modulesPath + "/virtualisation/qemu-vm.nix")
   ];
 

vm/peertube-vm.nix

@@ -1,7 +1,6 @@
 { pkgs, modulesPath, ... }: {
 
   imports = [
-    ../fediversity
     (modulesPath + "/virtualisation/qemu-vm.nix")
   ];
 

vm/pixelfed-vm.nix

@@ -1,7 +1,6 @@
 { pkgs, modulesPath, ... }: {
 
   imports = [
-    ../fediversity
     (modulesPath + "/virtualisation/qemu-vm.nix")
   ];