From 823f0bc77f0f4d72576007777456a454633e39cf Mon Sep 17 00:00:00 2001
From: afreakk <laderud@hotmail.com>
Date: Sun, 26 Jul 2020 12:59:49 +0200
Subject: [PATCH] dell/xps/13-9360: conflicting font fix

---
 dell/xps/13-9360/default.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/dell/xps/13-9360/default.nix b/dell/xps/13-9360/default.nix
index 439bbe0..e264a9f 100644
--- a/dell/xps/13-9360/default.nix
+++ b/dell/xps/13-9360/default.nix
@@ -1,14 +1,10 @@
 { 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";
-}) {
+{
+  # 4K screen, use bigger console font
+  # i18n.consoleFont deprecated and obsolete in >=20.03
+  # hardware-configuration.nix generates console.font
+  i18n.consoleFont = lib.mkIf (lib.versionOlder (lib.versions.majorMinor lib.version) "20.03") (lib.mkDefault "latarcyrheb-sun32");
   imports = [
     ../../../common/cpu/intel/kaby-lake
     ../../../common/pc/laptop