Compare commits
2 commits
main
...
valentin-r
Author | SHA1 | Date | |
---|---|---|---|
Nicolas Jeannerod | 5caad04862 | ||
54bf518928 |
10
flake.nix
10
flake.nix
|
@ -44,7 +44,7 @@
|
|||
nixosConfigurations = {
|
||||
mastodon = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = with self.nixosModules; [
|
||||
modules = with self.nixosModules; [
|
||||
disko.nixosModules.default
|
||||
disk-layout
|
||||
bleedingFediverse
|
||||
|
@ -97,9 +97,11 @@
|
|||
};
|
||||
};
|
||||
|
||||
## Fully-feature ISO installer
|
||||
mkInstaller = import ./installer.nix;
|
||||
installers = lib.mapAttrs (_: config: self.mkInstaller nixpkgs config) self.nixosConfigurations;
|
||||
installers =
|
||||
let
|
||||
installer = (import ./installer.nix) nixpkgs;
|
||||
in
|
||||
lib.mapAttrs (_: config: installer config) self.nixosConfigurations;
|
||||
|
||||
deploy =
|
||||
let
|
||||
|
|
|
@ -28,10 +28,8 @@ nixpkgs: machine:
|
|||
|
||||
isoImage = {
|
||||
compressImage = false;
|
||||
squashfsCompression = "lz4";
|
||||
squashfsCompression = "gzip -Xcompression-level 1";
|
||||
isoName = lib.mkForce "installer.iso";
|
||||
## ^^ FIXME: Use a more interesting name or keep the default name and
|
||||
## use `isoImage.isoName` in the tests.
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
@ -37,12 +37,7 @@ pkgs.nixosTest {
|
|||
nodes = {
|
||||
server = { config, ... }: {
|
||||
virtualisation.memorySize = lib.mkVMOverride 4096;
|
||||
imports = with self.nixosModules; [
|
||||
bleedingFediverse
|
||||
fediversity
|
||||
garage-vm
|
||||
mastodon-vm
|
||||
];
|
||||
imports = with self.nixosModules; [ bleedingFediverse garage-vm mastodon-vm ];
|
||||
# TODO: pair down
|
||||
environment.systemPackages = with pkgs; [
|
||||
python3
|
||||
|
|
|
@ -136,12 +136,7 @@ pkgs.nixosTest {
|
|||
memorySize = lib.mkVMOverride 8192;
|
||||
cores = 8;
|
||||
};
|
||||
imports = with self.nixosModules; [
|
||||
bleedingFediverse
|
||||
fediversity
|
||||
garage-vm
|
||||
pixelfed-vm
|
||||
];
|
||||
imports = with self.nixosModules; [ bleedingFediverse garage-vm pixelfed-vm ];
|
||||
# TODO: pair down
|
||||
environment.systemPackages = with pkgs; [
|
||||
python3
|
||||
|
|
Loading…
Reference in a new issue