From 603803164610371275b0054262e6de584b78eabe Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 3 May 2016 01:57:40 +0200 Subject: machines/labtops: Switch to use callMachines Should make the configurations much more easy to read. I did a small comparison between the machine derivations of the old Labtop and the Labtop with the new callMachines implementation using: diff -U 0 =(nix-store -qR old_labtop.drv | sort -t- -k 2) \ =(nix-store -qR new_labtop.drv | sort -t- -k 2) The following store paths were different in the output: /nix/store/...-etc.drv /nix/store/...-initrd.drv /nix/store/...-kernel-modules-shrunk.drv /nix/store/...-nixos.conf.drv /nix/store/...-nixos-system-labtop-16.09pre82222.fc92bbf-vuizvui.drv /nix/store/...-stage-1-init.sh.drv /nix/store/...-system-units.drv /nix/store/...-unit-systemd-modules-load.service.drv This is okay and is due to the reversed module evaluation order, because we now have the module definition enabling the Labtop profile in extraConfig instead of in the root config. Signed-off-by: aszlig Cc: @Profpatsch --- machines/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'machines/default.nix') diff --git a/machines/default.nix b/machines/default.nix index 11335a14..13cf8f6e 100644 --- a/machines/default.nix +++ b/machines/default.nix @@ -27,7 +27,9 @@ in { }; }; labnet = { - labtops = import ./labnet/labtop.nix { inherit (nixpkgs) lib; }; + labtops = callMachines ./labnet/labtop.nix { + extraConfig.vuizvui.user.openlab.labtops.enable = true; + }; }; profpatsch = { katara = callMachine ./profpatsch/katara.nix {}; -- cgit 1.4.1