about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authornikstur <nikstur@outlook.com>2024-04-17 18:02:20 +0200
committerGitHub <noreply@github.com>2024-04-17 18:02:20 +0200
commit5629a63379a4f69c97bd4dfdb31cf447e688dcdf (patch)
tree2fb6f3f0b604d618bc9fc62ed506fd070c811507 /nixos
parentac0d760e5dbefc547eba6149c683e2a52b686add (diff)
parent1f977157679661b2cf58774be632f3ca023ce1b6 (diff)
Merge pull request #304530 from blitz/autologin
Fix services.xserver.displayManager Warnings for VBox Appliance
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/profiles/demo.nix2
-rw-r--r--nixos/modules/profiles/graphical.nix7
2 files changed, 4 insertions, 5 deletions
diff --git a/nixos/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix
index 4e8c74deedba3..52ba40902e87a 100644
--- a/nixos/modules/profiles/demo.nix
+++ b/nixos/modules/profiles/demo.nix
@@ -11,7 +11,7 @@
       uid = 1000;
     };
 
-  services.xserver.displayManager = {
+  services.displayManager = {
     autoLogin = {
       enable = true;
       user = "demo";
diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix
index d80456cede565..8cc31652f8075 100644
--- a/nixos/modules/profiles/graphical.nix
+++ b/nixos/modules/profiles/graphical.nix
@@ -6,13 +6,12 @@
 {
   services.xserver = {
     enable = true;
-    displayManager.sddm.enable = true;
-    desktopManager.plasma5 = {
-      enable = true;
-    };
+    desktopManager.plasma5.enable = true;
     libinput.enable = true; # for touchpad support on many laptops
   };
 
+  services.displayManager.sddm.enable = true;
+
   # Enable sound in virtualbox appliances.
   hardware.pulseaudio.enable = true;