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

treewide: move hidpi settings to another module, make conditional on nixos version

Browse source
This commit is contained in:
K900 2023-03-23 16:46:38 +03:00
parent a4bc667096
commit 739fd62a50
4 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/hidpi.nix Normal file
View file

@ -0,0 +1,12 @@
{ lib, pkgs, ... }:
let
# This option is removed from NixOS 23.05 and up
nixosVersion = lib.versions.majorMinor lib.version;
config = if lib.versionOlder nixosVersion "23.05" then {
hardware.video.hidpi.enable = lib.mkDefault true;
} else {
# Just set the console font, don't mess with the font settings
console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-v32n.psf.gz";
console.earlySetup = lib.mkDefault true;
};
in config

1
flake.nix
View file

@ -180,6 +180,7 @@
common-gpu-nvidia = import ./common/gpu/nvidia/prime.nix;
common-gpu-nvidia-nonprime = import ./common/gpu/nvidia;
common-gpu-nvidia-disable = import ./common/gpu/nvidia/disable.nix;
common-hidpi = import ./common/hidpi.nix;
common-pc = import ./common/pc;
common-pc-hdd = import ./common/pc/hdd;
common-pc-laptop = import ./common/pc/laptop;

6
gpd/p2-max/default.nix
View file

@ -1,11 +1,9 @@
{lib, ...}: {
{
imports = [
../../common/pc/laptop
../../common/pc/laptop/ssd
../../common/cpu/intel
../../common/cpu/intel/kaby-lake
../../common/hidpi.nix
];
# HiDPI settings
hardware.video.hidpi.enable = lib.mkDefault true;
}

2
gpd/pocket-3/default.nix
View file

@ -5,6 +5,7 @@ in
imports = [
../../common/pc/laptop
../../common/pc/laptop/ssd
../../common/hidpi.nix
];
# Necessary kernel modules
@ -34,7 +35,6 @@ in
};
# More HiDPI settings
hardware.video.hidpi.enable = true;
services.xserver.dpi = 280;
# Necessary for audio support on the 1195G7 model