summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-03-05 11:15:34 -0600
committerMatthew Bauer <mjbauer95@gmail.com>2018-03-05 14:48:01 -0600
commit1e621ff423ecc0aa1377a2735405945691ec14d0 (patch)
tree55fac6820fb10d50b7699b11d7f0f0c7a939718b
parent4ff4ef51b77ef06ca8a9a00ee28bcd6447033680 (diff)
downloadnixpkgs-1e621ff423ecc0aa1377a2735405945691ec14d0.tar
nixpkgs-1e621ff423ecc0aa1377a2735405945691ec14d0.tar.gz
nixpkgs-1e621ff423ecc0aa1377a2735405945691ec14d0.tar.bz2
nixpkgs-1e621ff423ecc0aa1377a2735405945691ec14d0.tar.lz
nixpkgs-1e621ff423ecc0aa1377a2735405945691ec14d0.tar.xz
nixpkgs-1e621ff423ecc0aa1377a2735405945691ec14d0.tar.zst
nixpkgs-1e621ff423ecc0aa1377a2735405945691ec14d0.zip
demo: autologin through xserver
also disable upower on virtualbox
Fixes #36348
-rw-r--r--nixos/modules/installer/virtualbox-demo.nix2
-rw-r--r--nixos/modules/profiles/demo.nix6
2 files changed, 8 insertions, 0 deletions
diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix
index 5316cfce906..13a0d7f4f6e 100644
--- a/nixos/modules/installer/virtualbox-demo.nix
+++ b/nixos/modules/installer/virtualbox-demo.nix
@@ -19,4 +19,6 @@ with lib;
   # Add some more video drivers to give X11 a shot at working in
   # VMware and QEMU.
   services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" "modesetting" ];
+
+  powerManagement.enable = false;
 }
diff --git a/nixos/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix
index ef6fd77b5f8..c3ee6e98371 100644
--- a/nixos/modules/profiles/demo.nix
+++ b/nixos/modules/profiles/demo.nix
@@ -10,4 +10,10 @@
       password = "demo";
       uid = 1000;
     };
+
+  services.xserver.displayManager.sddm.autoLogin = {
+    enable = true;
+    relogin = true;
+    user = "demo";
+  };
 }