diff options
| -rw-r--r-- | tests/i3.nix | 14 | ||||
| -rw-r--r-- | tests/make-test.nix (renamed from labernix/tests/make-test.nix) | 4 |
2 files changed, 8 insertions, 10 deletions
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, ... }: '' diff --git a/labernix/tests/make-test.nix b/tests/make-test.nix index 10381afd..9276dae3 100644 --- a/labernix/tests/make-test.nix +++ b/tests/make-test.nix @@ -9,7 +9,7 @@ f: { system ? builtins.currentSystem, ... } @ args: let testArgs = if builtins.isFunction f then f (args // { pkgs = pkgs // { - labernix = import ../pkgs { inherit pkgs; }; + vuizvui = import ../pkgs { inherit pkgs; }; }; }) else f; @@ -18,7 +18,7 @@ f: { system ? builtins.currentSystem, ... } @ args: let } else {}); injectCommon = name: conf: { - imports = [ ../common.nix conf ]; + imports = [ conf ] ++ import ../modules/module-list.nix; }; testArgsWithCommon = removeAttrs testArgs [ "machine" ] // { |