From 9665025e13733d2f30cea42a32537a675798b116 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Thu, 12 Nov 2026 13:42:37 -0500 Subject: [PATCH] Rework flake.nix to use extendModules. --- nix/configuration/flake.nix | 79 ++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 31 deletions(-) diff --git a/nix/configuration/flake.nix b/nix/configuration/flake.nix index 4d55e90..d1296df 100644 --- a/nix/configuration/flake.nix +++ b/nix/configuration/flake.nix @@ -69,41 +69,52 @@ system = "x86_64-linux"; }; }; - nixosConfigs = builtins.mapAttrs ( - hostname: nodeConfig: format: - nixpkgs.lib.nixosSystem { - specialArgs = { - inherit self nix_builder; + baseConfig = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit self nix_builder; - this_nixos_config = self.nixosConfigurations."${hostname}"; - - all_nixos_configs = self.nixosConfigurations; - }; + all_nixos_configs = self.nixosConfigurations; + }; + modules = [ + impermanence.nixosModules.impermanence + lanzaboote.nixosModules.lanzaboote + disko.nixosModules.disko + ./configuration.nix + { + config = { + nixpkgs.overlays = [ + (final: prev: { + # stable = nixpkgs-stable.legacyPackages."${prev.stdenv.hostPlatform.system}"; + unoptimized = import nixpkgs { + system = prev.stdenv.hostPlatform.system; + hostPlatform.gcc.arch = "default"; + hostPlatform.gcc.tune = "default"; + }; + }) + ]; + }; + } + ]; + }; + toplevelConfigs = builtins.mapAttrs ( + hostname: nodeConfig: + baseConfig.extendModules { modules = [ - impermanence.nixosModules.impermanence - lanzaboote.nixosModules.lanzaboote - disko.nixosModules.disko - ./configuration.nix (./. + "/hosts/${hostname}") - (./. + "/formats/${format}.nix") { config = { nixpkgs.hostPlatform.system = nodeConfig.system; - nixpkgs.overlays = [ - (final: prev: { - # stable = nixpkgs-stable.legacyPackages."${prev.stdenv.hostPlatform.system}"; - unoptimized = import nixpkgs { - system = prev.stdenv.hostPlatform.system; - hostPlatform.gcc.arch = "default"; - hostPlatform.gcc.tune = "default"; - }; - }) - ]; }; } ]; + specialArgs.this_nixos_config = self.nixosConfigurations."${hostname}"; } ) nodes; + specialFormats = + nixosConfig: format: + nixosConfig.extendModules { + modules = [ (./. + "/formats/${format}.nix") ]; + }; installerConfig = hostname: nodeConfig: nixpkgs.lib.nixosSystem { @@ -117,18 +128,24 @@ }; in { - nixosConfigurations = (builtins.mapAttrs (name: value: value "toplevel") nixosConfigs); + nixosConfigurations = toplevelConfigs; } // { packages = ( forAllSystems ( system: - (builtins.mapAttrs (hostname: nodeConfig: { - iso = (nixosConfigs."${hostname}" "iso").config.system.build.isoImage; - vm_iso = (nixosConfigs."${hostname}" "vm_iso").config.system.build.isoImage; - sd = (nixosConfigs."${hostname}" "sd").config.system.build.sdImage; - installer = (installerConfig hostname nodes."${hostname}").config.system.build.isoImage; - }) (nixpkgs.lib.attrsets.filterAttrs (hostname: nodeConfig: nodeConfig.system == system) nodes)) + let + machines = ( + builtins.mapAttrs (hostname: nodeConfig: { + iso = (specialFormats self.nixosConfigurations."${hostname}" "iso").config.system.build.isoImage; + vm_iso = + (specialFormats self.nixosConfigurations."${hostname}" "vm_iso").config.system.build.isoImage; + sd = (specialFormats self.nixosConfigurations."${hostname}" "sd").config.system.build.sdImage; + installer = (installerConfig hostname nodes."${hostname}").config.system.build.isoImage; + }) (nixpkgs.lib.attrsets.filterAttrs (hostname: nodeConfig: nodeConfig.system == system) nodes) + ); + in + machines ) ); };