diff options
| -rw-r--r-- | ops/nixos/default.nix | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/ops/nixos/default.nix b/ops/nixos/default.nix index 312d762f246b..1d1e8da192b8 100644 --- a/ops/nixos/default.nix +++ b/ops/nixos/default.nix @@ -19,15 +19,23 @@ rec { allSystems = import ./all-systems.nix args; - nixosFor = configuration: depot.third_party.nixos { - configuration = { - inherit depot; + # This provides our standard set of arguments to all NixOS modules. + baseModule = { ... }: { + _module.args = { + inherit (args) depot; + }; + }; + + nixosFor = configuration: (depot.third_party.nixos { + configuration = { ... }: { imports = [ + baseModule + "${depot.depotPath}/ops/nixos/depot.nix" # TODO(lukegb): remove this once config.depot is no longer referenced. configuration - "${depot.depotPath}/ops/nixos/depot.nix" ]; + config.depot = depot; }; - }; + }); findSystem = hostname: (findFirst |