summary refs log tree commit diff
path: root/tests/xfce.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2011-03-17 14:04:47 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2011-03-17 14:04:47 +0000
commitc52aeacf1ade6897501920e9928ac69741010da9 (patch)
tree0cf1c6589e1883bf20a9782034001f9073114576 /tests/xfce.nix
parent6ee609a0a3155afb85efd4909e7bdbf044c17c75 (diff)
downloadnixpkgs-c52aeacf1ade6897501920e9928ac69741010da9.tar
nixpkgs-c52aeacf1ade6897501920e9928ac69741010da9.tar.gz
nixpkgs-c52aeacf1ade6897501920e9928ac69741010da9.tar.bz2
nixpkgs-c52aeacf1ade6897501920e9928ac69741010da9.tar.lz
nixpkgs-c52aeacf1ade6897501920e9928ac69741010da9.tar.xz
nixpkgs-c52aeacf1ade6897501920e9928ac69741010da9.tar.zst
nixpkgs-c52aeacf1ade6897501920e9928ac69741010da9.zip
* Factor out some test commonality.
svn path=/nixos/trunk/; revision=26394
Diffstat (limited to 'tests/xfce.nix')
-rw-r--r--tests/xfce.nix13
1 files changed, 3 insertions, 10 deletions
diff --git a/tests/xfce.nix b/tests/xfce.nix
index 2ebe7a7e5b9..3d0a6f7ee12 100644
--- a/tests/xfce.nix
+++ b/tests/xfce.nix
@@ -5,21 +5,14 @@
   machine = 
     { config, pkgs, ... }:
 
-    { services.xserver.enable = true;
+    { require = [ ./common/user-account.nix ];
+
+      services.xserver.enable = true;
 
       services.xserver.displayManager.auto.enable = true;
       services.xserver.displayManager.auto.user = "alice";
       
       services.xserver.desktopManager.xfce.enable = true;
-
-      users.extraUsers = pkgs.lib.singleton
-        { name = "alice";
-          description = "Alice Foobar";
-          home = "/home/alice";
-          createHome = true;
-          useDefaultShell = true;
-          password = "foobar";
-        };
     };
 
   testScript =