nixos/x11: don't use a submodule for xkb options (d891f369) · Commits · nix / nixpkgs

nixos/modules/services/x11/xserver.nix

+43 −49

Original line number	Diff line number	Diff line
		@@ -364,16 +364,12 @@ in
		'';
		};

		xkb = mkOption {
		default = { };
		description = "X keyboard extension (XKB) configuration";
		type = types.submodule {
		options = {
		xkb = {
		layout = mkOption {
		type = types.str;
		default = "us";
		description = lib.mdDoc ''
		Keyboard layout, or multiple keyboard layouts separated by commas.
		X keyboard layout, or multiple keyboard layouts separated by commas.
		'';
		};

		@@ -382,7 +378,7 @@ in
		default = "pc104";
		example = "presario";
		description = lib.mdDoc ''
		Keyboard model.
		X keyboard model.
		'';
		};

		@@ -413,8 +409,6 @@ in
		'';
		};
		};
		};
		};

		config = mkOption {
		type = types.lines;