From 3f772551d21e3a60c51862079ac72830d71ac452 Mon Sep 17 00:00:00 2001 From: iFargle Date: Tue, 19 Sep 2023 10:19:31 +0900 Subject: [PATCH] test --- flake.nix | 2 +- lib/default.nix | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 774cfbfc..e4cb439f 100644 --- a/flake.nix +++ b/flake.nix @@ -42,7 +42,7 @@ "albert@nixos-rpi4-03" = libx.mkHome { hostname = "nixos-rpi4-03"; platform = "aarch64-linux"; }; }; imageConfigurations = { - nixos-rpi4-img = nixos-generators.nixosGenerate { system = "aarch64-linux"; format = "sd-aarch64"; }; + nixos-rpi4-img = libx.mkImage { hostname = "nixos-rpi4-img"; platform = "aarch64-linux"; format = "sd-aarch64"; }; }; }; } \ No newline at end of file diff --git a/lib/default.nix b/lib/default.nix index 4c804d4b..a0ac889c 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -41,9 +41,10 @@ platform ? "x86_64-linux", installer , gpu ? null, - theme ? "default" - }: inputs.nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs desktop hostname username stateVersion gpu platform theme; }; + theme ? "default", + format + }: inputs.nixos-generators.nixosGenerate { + specialArgs = { inherit inputs outputs desktop hostname username stateVersion gpu platform theme format; }; system = "$platform"; modules = [ ../nixos @@ -51,7 +52,7 @@ inputs.sops-nix.nixosModules.sops inputs.lanzaboote.nixosModules.lanzaboote inputs.home-manager.nixosModules.home-manager { - extraSpecialArgs = { inherit inputs outputs desktop hostname platform username hmStateVersion theme; }; + extraSpecialArgs = { inherit inputs outputs desktop hostname platform username hmStateVersion theme format; }; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true;