nixosModules: refactor and always use pixelfed from lock

This commit is contained in:
Robert Hensing 2024-09-23 12:10:30 +02:00
parent a4fedcbc44
commit 46385f6174
5 changed files with 31 additions and 11 deletions

View file

@ -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 ];
});
}

View file

@ -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 = {

View file

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

View file

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

View file

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