mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 15:11:25 +00:00
kbd service: use systemd-vconsole-setup even with early setup
This way we have fonts reloaded on switches.
This commit is contained in:
parent
bc2f53fd29
commit
109ee2a338
@ -71,7 +71,7 @@ in
|
||||
###### implementation
|
||||
|
||||
config = mkMerge [
|
||||
(mkIf (!setVconsole || (setVconsole && config.boot.earlyVconsoleSetup)) {
|
||||
(mkIf (!setVconsole) {
|
||||
systemd.services."systemd-vconsole-setup".enable = false;
|
||||
})
|
||||
|
||||
@ -97,9 +97,7 @@ in
|
||||
printf "${makeColorCS n color}" >> /dev/console
|
||||
'') config.i18n.consoleColors}
|
||||
'';
|
||||
}
|
||||
|
||||
(mkIf (!config.boot.earlyVconsoleSetup) {
|
||||
systemd.services."systemd-vconsole-setup" =
|
||||
{ wantedBy = [ "sysinit.target" ];
|
||||
before = [ "display-manager.service" ];
|
||||
@ -107,7 +105,7 @@ in
|
||||
restartTriggers = [ vconsoleConf kbdEnv ];
|
||||
restartIfChanged = false; # fails when tty is inactive
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
(mkIf config.boot.earlyVconsoleSetup {
|
||||
boot.initrd.extraUtilsCommands = ''
|
||||
|
Loading…
Reference in New Issue
Block a user