eeva/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware synced 2024-11-23 11:29:42 +01:00
Code Issues Releases Wiki Activity

Merge pull request #163 from 00-matt/dell-xps-13-9360/consolefont

Browse source
This commit is contained in:
Jörg Thalheim 2020-05-15 07:43:50 +01:00 committed by GitHub
commit a36f343222
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 {};