Merge branch 'kmscon-extraoptions' of git://github.com/nathan7/nixpkgs

This commit is contained in:
Shea Levy 2016-01-03 10:01:43 -05:00
commit 06356c90dc

View File

@ -32,6 +32,13 @@ in {
default = "";
example = "font-size=14";
};
extraOptions = mkOption {
description = "Extra flags to pass to kmscon.";
type = types.separatedString " ";
default = "";
example = "--term xterm-256color";
};
};
};
@ -53,7 +60,7 @@ in {
ConditionPathExists=/dev/tty0
[Service]
ExecStart=${pkgs.kmscon}/bin/kmscon "--vt=%I" --seats=seat0 --no-switchvt --configdir ${configDir} --login -- ${pkgs.shadow}/bin/login -p
ExecStart=${pkgs.kmscon}/bin/kmscon "--vt=%I" ${cfg.extraOptions} --seats=seat0 --no-switchvt --configdir ${configDir} --login -- ${pkgs.shadow}/bin/login -p
UtmpIdentifier=%I
TTYPath=/dev/%I
TTYReset=yes