This commit is contained in:
albert 2024-04-24 10:46:03 +09:00
parent daee10acee
commit 117010cf53
No known key found for this signature in database
GPG key ID: 64F6C4EB46C4543A
2 changed files with 22 additions and 5 deletions

View file

@ -65,6 +65,7 @@
backups-rpi4 = libx.mkHost { hostname = "backups-rpi4"; system = "aarch64-linux"; type = "small"; };
piaware-rpi4 = libx.mkHost { hostname = "piaware-rpi4"; system = "aarch64-linux"; type = "small"; };
quitman-rpi4 = libx.mkHost { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; };
bakersfield-rpi4 = libx.mkHost { hostname = "bakersfield-rpi4"; system = "aarch64-linux"; type = "small"; };
};
homeConfigurations = {
"albert@osaka-linode-01" = libx.mkHome { hostname = "osaka-linode-01"; type = "small"; };
@ -92,7 +93,7 @@
nixos-linode-img = libx.mkMinImage { hostname = "nixos-linode-img"; format = "linode"; };
nixos-rpi4-img = libx.mkImage { hostname = "nixos-rpi4-img"; format = "sd-aarch64"; system = "aarch64-linux"; };
nixos-iso-console = libx.mkImage { hostname = "nixos-iso-console"; format = "iso"; };
nixos-iso-desktop = libx.mkImage { hostname = "nixos-iso-desktop"; format = "iso"; desktop = "gnome"; };
nixos-iso-desktop = libx.mkImage { hostname = "nixos-iso-desktop"; format = "iso"; desktop = "plasma6"; unfree = true; repo = "nixpkgs-unstable"; };
};
# Checks for deploy-rs - Makes deploy-rs fail when system evaluations fail

View file

@ -115,9 +115,25 @@
system ? "x86_64-linux",
gpu ? null,
theme ? "stylix",
repo ? "nixpkgs",
unfree ? false,
format
}: inputs.nixos-generators.nixosGenerate {
specialArgs = { inherit inputs outputs desktop hostname username stateVersion hmStateVersion gpu system theme format; };
specialArgs = {
inherit inputs outputs desktop hostname username stateVersion hmStateVersion gpu system theme format;
# Choose whether to pull from stable or unstable
pkgs = import inputs.${repo} {
inherit system;
config.allowUnfree = unfree;
hostPlatform = system;
};
# Some packages (ie, Vintage Story) I want to keep on unstable no matter what default repo I use
pkgs-unstable = import inputs.nixpkgs-unstable {
inherit system;
config.allowUnfree = unfree;
hostPlatform = system;
};
};
system = system;
format = format;