summaryrefslogtreecommitdiffstats
path: root/nixos
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2022-03-19 21:01:10 +0100
committerVladimír Čunát <v@cunat.cz>2022-03-19 21:11:41 +0100
commitfd609f92336b4c1677697b09202cfc1439f35aec (patch)
tree349a8f0da476bbf52402b43fc580b5c35728e105 /nixos
parentfc18d54a06a28a8da550836622df83dc071089a8 (diff)
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.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/x11/display-managers/default.nix19
1 files changed, 1 insertions, 18 deletions
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 03fe68fe5058..a5db3dd5dd45 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";