movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 20:55:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/console: detect unicode properly

Browse source
This commit is contained in:
Weijia Wang 2022-08-02 20:39:08 +02:00 • committed by Alyssa Ross
parent a17e46020f
commit 05958b228b
1 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
nixos/modules/config/console.nix
View file

@ -8,14 +8,23 @@ let
makeColor = i: concatMapStringsSep "," (x: "0x" + substring (2*i) 2 x); makeColor = i: concatMapStringsSep "," (x: "0x" + substring (2*i) 2 x);
isUnicode = hasSuffix "UTF-8" (toUpper config.i18n.defaultLocale); isUnicode = '' \
LOCALE_ARCHIVE=${config.i18n.glibcLocales}/lib/locale/locale-archive \
LANG=${config.i18n.defaultLocale} \
LC_IDENTIFICATION=${config.i18n.defaultLocale} \
locale -k identification-codeset | grep -i UTF-8 \
'';
optimizedKeymap = pkgs.runCommand "keymap" { optimizedKeymap = pkgs.runCommand "keymap" {
nativeBuildInputs = [ pkgs.buildPackages.kbd ]; nativeBuildInputs = with pkgs.buildPackages; [ kbd locale ];
LOADKEYS_KEYMAP_PATH = "${consoleEnv pkgs.kbd}/share/keymaps/**"; LOADKEYS_KEYMAP_PATH = "${consoleEnv pkgs.kbd}/share/keymaps/**";
preferLocalBuild = true; preferLocalBuild = true;
} '' } ''
loadkeys -b ${optionalString isUnicode "-u"} "${cfg.keyMap}" > $out if ${isUnicode} ; then
loadkeys -b -u "${cfg.keyMap}" > $out
else
loadkeys -b "${cfg.keyMap}" > $out
fi
''; '';
# Sadly, systemd-vconsole-setup doesn't support binary keymaps. # Sadly, systemd-vconsole-setup doesn't support binary keymaps.
@ -130,7 +139,7 @@ in
}) })
(mkIf setVconsole (mkMerge [ (mkIf setVconsole (mkMerge [
{ environment.systemPackages = [ pkgs.kbd ]; { environment.systemPackages = with pkgs; [ kbd locale ];
# Let systemd-vconsole-setup.service do the work of setting up the # Let systemd-vconsole-setup.service do the work of setting up the
# virtual consoles. # virtual consoles.
@ -139,8 +148,13 @@ in
environment.etc.kbd.source = "${consoleEnv pkgs.kbd}/share"; environment.etc.kbd.source = "${consoleEnv pkgs.kbd}/share";
boot.initrd.preLVMCommands = mkIf (!config.boot.initrd.systemd.enable) (mkBefore '' boot.initrd.preLVMCommands = mkIf (!config.boot.initrd.systemd.enable) (mkBefore ''
kbd_mode ${if isUnicode then "-u" else "-a"} -C /dev/console if ${isUnicode} ; then
printf "\033%%${if isUnicode then "G" else "@"}" >> /dev/console kbd_mode -u -C /dev/console
printf "\033%%G" >> /dev/console
else
kbd_mode -a -C /dev/console
printf "\033%%@" >> /dev/console
fi
loadkmap < ${optimizedKeymap} loadkmap < ${optimizedKeymap}
${optionalString cfg.earlySetup '' ${optionalString cfg.earlySetup ''