cilly/flakes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'tmp/caramel' into staging/20221003

Browse source
This commit is contained in:
LavaDesu 2022-10-03 21:01:11 +07:00
commit a6ea2431f0
Signed by: cilly
GPG key ID: 6500251E087653C9
14 changed files with 133 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

29
flake.nix
View file

@ -52,13 +52,13 @@
mkSystem =
if !(self ? rev) then throw "Dirty git tree detected." else
nixpkgs: name: arch: enableGUI: nixpkgs.lib.nixosSystem {
nixpkgs: name: arch: enableGUI: extraModules: nixpkgs.lib.nixosSystem {
system = arch;
modules = [
{ nixpkgs.overlays = overlays; }
agenix.nixosModules.age
(./hosts + "/${name}")
];
] ++ extraModules;
specialArgs = {
inherit inputs enableGUI;
modules = import ./modules { lib = nixpkgs.lib; };
@ -66,10 +66,16 @@
};
in
{
nixosConfigurations."blossom" = mkSystem nixpkgs "blossom" "x86_64-linux" true;
nixosConfigurations."blossom" = mkSystem nixpkgs "blossom" "x86_64-linux" true [];
nixosConfigurations."caramel" = mkSystem nixpkgs-porcupine "caramel" "aarch64-linux" false;
nixosConfigurations."sugarcane" = mkSystem nixpkgs-porcupine "sugarcane" "x86_64-linux" false;
nixosConfigurations."caramel" = mkSystem nixpkgs-porcupine "caramel" "aarch64-linux" false [{
nixpkgs.overlays = [
(self: super: {
makeModulesClosure = x: super.makeModulesClosure (x // { allowMissing = true; });
})
];
}];
nixosConfigurations."sugarcane" = mkSystem nixpkgs-porcupine "sugarcane" "x86_64-linux" false [];
packages."x86_64-linux" =
let
@ -92,18 +98,7 @@
{
inherit (pkgs) nixUnstable;
caramel-iso = nixos-generators.nixosGenerate {
inherit pkgs;
format = "sd-aarch64";
modules = [
agenix.nixosModules.age
./hosts/caramel
];
specialArgs = {
inherit inputs;
modules = import ./modules { lib = nixpkgs-porcupine.lib; };
};
};
caramel-img = self.nixosConfigurations."caramel".config.system.build.sdImage;
};
# TODO: currently broken