From 12ac17cc96040cc0ba150dea25b6bcd727fbf9e3 Mon Sep 17 00:00:00 2001 From: sefidel Date: Tue, 23 Jan 2024 00:35:45 +0900 Subject: feat(lib/mk_system): let colmena deployment options to be set without breaking eval --- lib/mk_system.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/mk_system.nix') diff --git a/lib/mk_system.nix b/lib/mk_system.nix index ff51fef..70149fe 100644 --- a/lib/mk_system.nix +++ b/lib/mk_system.nix @@ -1,4 +1,4 @@ -{ self, unstable, ... } @ args: +{ self, unstable, colmena, ... } @ args: { mkSystem = { name, nixpkgs ? unstable, system ? "x86_64-linux", overlays ? null, extraModules ? null }: nixpkgs.lib.nixosSystem ( @@ -27,6 +27,9 @@ ../modules/nixpkgs.nix ] ++ nixpkgs.lib.optional (overlays != null) { nixpkgs.overlays = overlays; } ++ nixpkgs.lib.optionals (extraModules != null) extraModules; + + # let deployment options to be set without breaking eval on nixosConfigurations + extraModules = [ colmena.nixosModules.deploymentOptions ]; } ); -- cgit 1.4.1