From 5672131186ef00dd155d453ca6c1f08f73b98c47 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Tue, 23 Sep 2025 15:29:29 +0200 Subject: [PATCH] WIP: switch to open modules --- flake.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index 4cc340b..f7b34ea 100644 --- a/flake.nix +++ b/flake.nix @@ -46,7 +46,6 @@ # cute-api = builtins.getFlake "gitlab:bertof/cute-api/0.2.1-3"; - installerModules = [ self.nixosModules.commonModules ./nixos/installer.nix ]; in inputs.flake-parts.lib.mkFlake { inherit inputs; } { systems = import inputs.systems; @@ -86,39 +85,36 @@ wl-update-background ; - # inherit (cute-api.packages.${system}) cute-api; - # Installer ISO install-iso = inputs.nixos-generators.nixosGenerate { inherit system; - modules = installerModules; + modules = [ self.nixosModules.installerModules ]; format = "install-iso"; }; # RAW base image raw-base-image = inputs.nixos-generators.nixosGenerate { inherit system; - modules = installerModules; + modules = [ self.nixosModules.installerModules ]; format = "raw-efi"; }; # VMDK base image vmdk-base-image = inputs.nixos-generators.nixosGenerate { system = "x86_64-linux"; - modules = installerModules; + modules = [ self.nixosModules.installerModules ]; format = "vmware"; }; # Aarch64 base image aarch64-base-image = inputs.nixos-generators.nixosGenerate { system = "aarch64-linux"; - modules = installerModules; + modules = [ self.nixosModules.installerModules ]; format = "sd-aarch64"; }; # Installer DigitalOcean do-image = inputs.nixos-generators.nixosGenerate { inherit system; - modules = installerModules; + modules = [ self.nixosModules.installerModules ]; format = "do"; }; - }; }; @@ -237,6 +233,8 @@ ]; home-manager.users.bertof.imports = [ ./hm/hyprland.nix ]; }; + + installerModules = { imports = [ self.nixosModules.commonModules ./nixos/installer.nix ]; }; }; nixosConfigurations = {