aires/nixos-hardware
aires/nixos-hardware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

dell/xps/13-9360: Stop using i18n.consoleFont

Browse source 
trace: warning: The option `i18n.consoleFont' defined in
`/nix/var/nix/profiles/per-user/root/channels/nixos-hardware/dell/xps/13-9360'
has been renamed to `console.font'.
This commit is contained in:
Matthew Smith 2020-05-14 20:33:15 +01:00
parent 8e8e65ba45
commit 69b9bdd53a
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,14 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
{ # TODO: move to general HiDPI profile
# 4K screen, use bigger console font
# i18n.consoleFont deprecated in >=20.03, choose option based on OS version
lib.recursiveUpdate
(if lib.versionAtLeast (lib.versions.majorMinor lib.version) "20.03" then {
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
@ -16,9 +24,6 @@
hardware.firmware = lib.mkBefore [ pkgs.qca6174-firmware ]; hardware.firmware = lib.mkBefore [ pkgs.qca6174-firmware ];
# TODO: move to general HiDPI profile
i18n.consoleFont = lib.mkDefault "latarcyrheb-sun32"; # 4K screen, use bigger console font
# TODO: upstream to NixOS/nixpkgs # TODO: upstream to NixOS/nixpkgs
nixpkgs.overlays = [(final: previous: { nixpkgs.overlays = [(final: previous: {
qca6174-firmware = final.callPackage ./qca6174-firmware.nix {}; qca6174-firmware = final.callPackage ./qca6174-firmware.nix {};