From 0d0842492943d7d90d4320ec6e4461de918e6af3 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Sat, 10 Apr 2021 14:31:14 -0400 Subject: [PATCH] make hosts config portable --- flake.nix | 2 +- hosts/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 2216a19..00c2a99 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ imports = [ ./. ]; config = { sconfig.flakes.enable = true; }; }; - nixosConfigurations = import ./hosts { inherit unstable stable2009; }; + nixosConfigurations = import ./hosts { sconfig = ./.; inherit unstable stable2009; }; defaultPackage."x86_64-linux" = with (import unstable { system = "x86_64-linux"; }); diff --git a/hosts/default.nix b/hosts/default.nix index 4aed7d9..ba63595 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,4 +1,4 @@ -{ unstable, stable2009 }: +{ sconfig, unstable, stable2009 }: let hostMetadata = @@ -29,7 +29,7 @@ builtins.listToAttrs ( value = pkgs.lib.nixosSystem { system = h.system; modules = [ - (./..) + (sconfig) (./. + "/${h.name}/configuration.nix") (hardwareModule { inherit pkgs; inherit (h) hardware; }) ({ ... }: {