From fd609f92336b4c1677697b09202cfc1439f35aec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 19 Mar 2022 21:01:10 +0100 Subject: [PATCH] nixos services.xserver.displayManager.session: drop type For now at least. I expect someone will find a working type later. It's incorrect and was causing bad issues. Example test case: nix-instantiate nixos/release.nix -A tests.xfce.x86_64-linux --dry-run This is a partial revert of commit b2d803c from PR #162271. --- .../services/x11/display-managers/default.nix | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 03fe68fe505..a5db3dd5dd4 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -219,24 +219,7 @@ in session = mkOption { default = []; - type = with types; listOf (submodule ({ ... }: { - options = { - manage = mkOption { - description = "Whether this is a desktop or a window manager"; - type = enum [ "desktop" "window" ]; - }; - - name = mkOption { - description = "Name of this session"; - type = str; - }; - - start = mkOption { - description = "Commands to run to start this session"; - type = lines; - }; - }; - })); + type = types.listOf types.attrs; example = literalExpression '' [ { manage = "desktop";