From a41fd5b7223fc83d43ede24477294685ddaf67a7 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 18 Mar 2015 11:48:05 +0100
Subject: tests: Integrate make-test.nix from labernix.

We already have abstracted the injection of the module list in labernix,
so we can reuse this with only minor changes.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 tests/i3.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'tests/i3.nix')

diff --git a/tests/i3.nix b/tests/i3.nix
index 0505b67f..e0842bc6 100644
--- a/tests/i3.nix
+++ b/tests/i3.nix
@@ -1,11 +1,12 @@
-import <nixpkgs/nixos/tests/make-test.nix> ({ pkgs, ... }: {
+import ./make-test.nix ({ pkgs, ... }: {
   name = "i3";
 
   machine = { lib, ... }: {
-    imports = [
-      ../common.nix
-      <nixpkgs/nixos/tests/common/x11.nix>
-    ];
+    imports = [ <nixpkgs/nixos/tests/common/x11.nix> ];
+
+    vuizvui.user.aszlig.profiles.base.enable = true;
+    vuizvui.user.aszlig.services.i3.enable = true;
+
     services.xserver.windowManager.default = lib.mkForce "i3";
     /* XXX */
     fonts = {
@@ -18,9 +19,6 @@ import <nixpkgs/nixos/tests/make-test.nix> ({ pkgs, ... }: {
       ];
     };
     /* !XXX */
-    vuizvui = {
-      i3.enable = true;
-    };
   };
 
   testScript = { nodes, ... }: ''
-- 
cgit 1.4.1