Merge pull request #180 from afreakk/master
This commit is contained in:
commit
ad72510a2b
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue