From c9bd295faa26e94485233a211285f5ddaa50fba4 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 23 Sep 2024 12:10:30 +0200
Subject: [PATCH] nixosModules: move pixelfed package definition into flake
 lexical scope

---
 fediversity/pixelfed.nix |  3 ---
 flake.nix                | 36 +++++++++++++++++++++++++++++++-----
 vm/mastodon-vm.nix       |  1 -
 vm/peertube-vm.nix       |  1 -
 vm/pixelfed-vm.nix       |  1 -
 5 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/fediversity/pixelfed.nix b/fediversity/pixelfed.nix
index 1edc914..1c1646d 100644
--- a/fediversity/pixelfed.nix
+++ b/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 ];
-  });
 }
diff --git a/flake.nix b/flake.nix
index 55fde29..a655038 100644
--- a/flake.nix
+++ b/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;
-      mastodon-vm = ./vm/mastodon-vm.nix;
-      peertube-vm = ./vm/peertube-vm.nix;
-      pixelfed-vm = ./vm/pixelfed-vm.nix;
+      interactive-vm = {
+        imports = [
+          ./vm/interactive-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 = {
diff --git a/vm/mastodon-vm.nix b/vm/mastodon-vm.nix
index ea17f27..4b28492 100644
--- a/vm/mastodon-vm.nix
+++ b/vm/mastodon-vm.nix
@@ -1,7 +1,6 @@
 { modulesPath, lib, config, ... }: {
 
   imports = [
-    ../fediversity
     (modulesPath + "/virtualisation/qemu-vm.nix")
   ];
 
diff --git a/vm/peertube-vm.nix b/vm/peertube-vm.nix
index 5f40f4f..b701682 100644
--- a/vm/peertube-vm.nix
+++ b/vm/peertube-vm.nix
@@ -1,7 +1,6 @@
 { pkgs, modulesPath, ... }: {
 
   imports = [
-    ../fediversity
     (modulesPath + "/virtualisation/qemu-vm.nix")
   ];
 
diff --git a/vm/pixelfed-vm.nix b/vm/pixelfed-vm.nix
index 8f97180..3510d0b 100644
--- a/vm/pixelfed-vm.nix
+++ b/vm/pixelfed-vm.nix
@@ -1,7 +1,6 @@
 { pkgs, modulesPath, ... }: {
 
   imports = [
-    ../fediversity
     (modulesPath + "/virtualisation/qemu-vm.nix")
   ];