diff options
Diffstat (limited to 'nixos/modules/config/console.nix')
| -rw-r--r-- | nixos/modules/config/console.nix | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix index 89b75184c5d..1f8f80a554d 100644 --- a/nixos/modules/config/console.nix +++ b/nixos/modules/config/console.nix @@ -8,23 +8,14 @@ let makeColor = i: concatMapStringsSep "," (x: "0x" + substring (2*i) 2 x); - 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 \ - ''; + isUnicode = hasSuffix "UTF-8" (toUpper config.i18n.defaultLocale); optimizedKeymap = pkgs.runCommand "keymap" { - nativeBuildInputs = with pkgs.buildPackages; [ kbd locale ]; + nativeBuildInputs = [ pkgs.buildPackages.kbd ]; LOADKEYS_KEYMAP_PATH = "${consoleEnv pkgs.kbd}/share/keymaps/**"; preferLocalBuild = true; } '' - if ${isUnicode} ; then - loadkeys -b -u "${cfg.keyMap}" > $out - else - loadkeys -b "${cfg.keyMap}" > $out - fi + loadkeys -b ${optionalString isUnicode "-u"} "${cfg.keyMap}" > $out ''; # Sadly, systemd-vconsole-setup doesn't support binary keymaps. @@ -139,7 +130,7 @@ in }) (mkIf setVconsole (mkMerge [ - { environment.systemPackages = with pkgs; [ kbd locale ]; + { environment.systemPackages = [ pkgs.kbd ]; # Let systemd-vconsole-setup.service do the work of setting up the # virtual consoles. @@ -148,13 +139,8 @@ in environment.etc.kbd.source = "${consoleEnv pkgs.kbd}/share"; boot.initrd.preLVMCommands = mkIf (!config.boot.initrd.systemd.enable) (mkBefore '' - if ${isUnicode} ; then - kbd_mode -u -C /dev/console - printf "\033%%G" >> /dev/console - else - kbd_mode -a -C /dev/console - printf "\033%%@" >> /dev/console - fi + kbd_mode ${if isUnicode then "-u" else "-a"} -C /dev/console + printf "\033%%${if isUnicode then "G" else "@"}" >> /dev/console loadkmap < ${optimizedKeymap} ${optionalString cfg.earlySetup '' |