Fediversity/simple-nixos-fediverse
Archived
7
1
Fork 2
Code Issues 23 Pull requests 1 Actions Projects Wiki Activity

pixelfed-from-lock #23

Closed
roberth wants to merge 4 commits from pixelfed-from-lock into pixelfed-on-metal
pull from: pixelfed-from-lock
merge into: Fediversity:pixelfed-on-metal
Conversation 8 Commits 4 Files changed 5 +35 -12
5 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fediversity/pixelfed.nix
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 ];
});
}

41
flake.nix
View file

@ -5,21 +5,50 @@
nixpkgs.url = "github:radvendii/nixpkgs/nixos_rebuild_tests";
};
outputs = { self, nixpkgs }:
outputs = inputs@{ self, nixpkgs }:
let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
in {
packages.${system} = {
pixelfed = pkgs.pixelfed.overrideAttrs (old: {
patches = (old.patches or [ ]) ++ [ ./fediversity/pixelfed-group-permissions.patch ];
});
};
nixosModules = {
## Fediversity modules
fediversity = import ./fediversity;
fediversity = { pkgs, ... }: {
imports = [ ./fediversity ];
services.pixelfed.package = self.packages.${pkgs.stdenv.hostPlatform.system}.pixelfed;
};
## 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;
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
taeer commented 2024-09-25 01:58:34 +02:00
Outdated
Review
Copy link

Can you explain what makes this organization better than the one we currently have? I don't have an intuition either way so I'd like to understand the motivation for the change.

Can you explain what makes this organization better than the one we currently have? I don't have an intuition either way so I'd like to understand the motivation for the change.
self.nixosModules.fediversity
];
};
};
nixosConfigurations = {

1
vm/mastodon-vm.nix
View file

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

1
vm/peertube-vm.nix
View file

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

1
vm/pixelfed-vm.nix
View file

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