From ccc0fc97fe168e13d8c9cb7374f91e2b326a63d8 Mon Sep 17 00:00:00 2001 From: Pacman99 Date: Thu, 13 May 2021 17:03:51 -0700 Subject: [PATCH] flake.nix: use `imports` for auto-import of hosts This makes the auto-importing of hosts obvious and explicitly indicates how the options would end up getting merged. --- flake.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 02ef12ae..59d91552 100644 --- a/flake.nix +++ b/flake.nix @@ -65,10 +65,12 @@ ./modules/customBuilds.nix ]; }; - hosts = nixos.lib.mkMerge [ - (devlib.lib.importers.importHosts ./hosts) - { /* set host specific properties here */ } - ]; + + imports = [ (devlib.lib.importers.importHosts ./hosts) ]; + hosts = { + /* set host specific properties here */ + NixOS = { }; + }; profiles = [ ./profiles ./users ]; suites = { profiles, users, ... }: with profiles; { base = [ core users.nixos users.root ];