From 69b9bdd53a6c5d2559066691349282f8f961cb3e Mon Sep 17 00:00:00 2001
From: Matthew Smith <matt@offtopica.uk>
Date: Thu, 14 May 2020 20:33:15 +0100
Subject: [PATCH] dell/xps/13-9360: Stop using i18n.consoleFont

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'.
---
 dell/xps/13-9360/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/dell/xps/13-9360/default.nix b/dell/xps/13-9360/default.nix
index 5ff1e54..439bbe0 100644
--- a/dell/xps/13-9360/default.nix
+++ b/dell/xps/13-9360/default.nix
@@ -1,6 +1,14 @@
 { 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 = [
     ../../../common/cpu/intel/kaby-lake
     ../../../common/pc/laptop
@@ -16,9 +24,6 @@
 
   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
   nixpkgs.overlays = [(final: previous: {
     qca6174-firmware = final.callPackage ./qca6174-firmware.nix {};