Merge pull request #11228 from ocharles/x-ctrl-alt-backspace

services.xserver: Disable Ctrl+Alt+Backspace by default
This commit is contained in:
Eelco Dolstra 2015-12-17 11:49:54 +01:00
commit b475afcf60

View File

@ -409,6 +409,16 @@ in
if possible.
'';
};
enableCtrlAltBackspace = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable the DontZap option, which binds Ctrl+Alt+Backspace
to forcefully kill X. This can lead to data loss and is disabled
by default.
'';
};
};
};
@ -534,6 +544,7 @@ in
''
Section "ServerFlags"
Option "AllowMouseOpenFail" "on"
Option "DontZap" "${if cfg.enableCtrlAltBackspace then "off" else "on"}"
${cfg.serverFlagsSection}
EndSection