From 6a9858992dd436c7acd887e59d6bf8621fe70a75 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Mon, 12 Apr 2021 20:42:45 -0400 Subject: [PATCH] add modules argument to hosts --- flake.nix | 2 +- hosts/default.nix | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index a9c3ec2..1a43aae 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,6 @@ imports = [ ./. ]; config = { sconfig.flakes.enable = true; }; }; - nixosConfigurations = import ./hosts { sconfig = ./.; inherit unstable stable2009; }; + nixosConfigurations = import ./hosts { modules = [ ./. ]; inherit unstable stable2009; }; }; } diff --git a/hosts/default.nix b/hosts/default.nix index a41ec39..89c345c 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,4 +1,4 @@ -{ sconfig, unstable, stable2009 }: +{ modules, unstable, stable2009 }: let hostMetadata = @@ -25,8 +25,7 @@ builtins.mapAttrs in pkgs.lib.nixosSystem { inherit (v) system; - modules = [ - (sconfig) + modules = modules ++ [ (./. + "/${n}/configuration.nix") (hardwareModule v.hardware) ({ ... }: {