eeva/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware synced 2024-12-02 15:59:43 +01:00
Code Issues Releases Wiki Activity

dell/xps/13-9360: conflicting font fix

Browse source
This commit is contained in:
afreakk 2020-07-26 12:59:49 +02:00
parent cc353d439e
commit 823f0bc77f
No known key found for this signature in database
GPG key ID: 8B980523664C3A52
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dell/xps/13-9360/default.nix
View file

@ -1,14 +1,10 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
# TODO: move to general HiDPI profile {
# 4K screen, use bigger console font # 4K screen, use bigger console font
# i18n.consoleFont deprecated in >=20.03, choose option based on OS version # i18n.consoleFont deprecated and obsolete in >=20.03
lib.recursiveUpdate # hardware-configuration.nix generates console.font
(if lib.versionAtLeast (lib.versions.majorMinor lib.version) "20.03" then { i18n.consoleFont = lib.mkIf (lib.versionOlder (lib.versions.majorMinor lib.version) "20.03") (lib.mkDefault "latarcyrheb-sun32");
console.font = lib.mkDefault "latarcyrheb-sun32";
} else {
i18n.consoleFont = lib.mkDefault "latarcyrheb-sun32";
}) {
imports = [ imports = [
../../../common/cpu/intel/kaby-lake ../../../common/cpu/intel/kaby-lake
../../../common/pc/laptop ../../../common/pc/laptop