diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-02-16 16:45:19 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-02-16 17:08:13 +0300 |
| commit | 109ee2a338eeff0d6be820e2caa2950922124cf1 (patch) | |
| tree | 3c75ead15788e9f3c02628024349b1cf442d43fd /nixos | |
| parent | bc2f53fd295c5e9f290b6705789653497aeb047a (diff) | |
| download | nixlib-109ee2a338eeff0d6be820e2caa2950922124cf1.tar nixlib-109ee2a338eeff0d6be820e2caa2950922124cf1.tar.gz nixlib-109ee2a338eeff0d6be820e2caa2950922124cf1.tar.bz2 nixlib-109ee2a338eeff0d6be820e2caa2950922124cf1.tar.lz nixlib-109ee2a338eeff0d6be820e2caa2950922124cf1.tar.xz nixlib-109ee2a338eeff0d6be820e2caa2950922124cf1.tar.zst nixlib-109ee2a338eeff0d6be820e2caa2950922124cf1.zip | |
kbd service: use systemd-vconsole-setup even with early setup
This way we have fonts reloaded on switches.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/tasks/kbd.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix index 0af376a90bcf..4aa4c7d22ac2 100644 --- a/nixos/modules/tasks/kbd.nix +++ b/nixos/modules/tasks/kbd.nix @@ -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 = '' |