From e8b624eb0ce79d1b359bda4123ba7cd4de1e98be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Fri, 1 Mar 2024 10:35:33 +0200 Subject: [PATCH] vm: simplify with lightdm --- hosts/vm/configuration.nix | 18 ++---------------- modules/profiles/desktop/default.nix | 6 +----- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/hosts/vm/configuration.nix b/hosts/vm/configuration.nix index d4d500a..93a9546 100644 --- a/hosts/vm/configuration.nix +++ b/hosts/vm/configuration.nix @@ -28,10 +28,7 @@ mj = { stateVersion = "23.11"; timeZone = "UTC"; - desktop = { - username = "nixos"; - configureDM = false; - }; + desktop.username = "nixos"; }; isoImage = { @@ -49,18 +46,7 @@ services = { pcscd.enable = true; getty.autologinUser = "nixos"; - xserver = { - enable = true; - desktopManager.xfce.enable = true; - displayManager = { - lightdm.enable = true; - defaultSession = "none+awesome"; - autoLogin = { - enable = true; - user = "nixos"; - }; - }; - }; + xserver.enable = true; }; programs = { diff --git a/modules/profiles/desktop/default.nix b/modules/profiles/desktop/default.nix index d1d33f7..9e48112 100644 --- a/modules/profiles/desktop/default.nix +++ b/modules/profiles/desktop/default.nix @@ -11,10 +11,6 @@ in { type = str; default = "motiejus"; }; - configureDM = lib.mkOption { - type = bool; - default = true; - }; }; config = { @@ -67,7 +63,7 @@ in { desktopManager.xfce.enable = true; windowManager.awesome.enable = true; - displayManager = lib.mkIf cfg.configureDM { + displayManager = { lightdm.enable = true; defaultSession = "none+awesome"; autoLogin = {