mirror of
https://github.com/NixOS/nixos-hardware
synced 2024-12-23 01:59:45 +01:00
Merge #586
586: treewide: unset hardware.video.hidpi r=K900 a=K900 Co-authored-by: K900 <me@0upti.me>
This commit is contained in:
commit
648021dcb2
4 changed files with 16 additions and 5 deletions
12
common/hidpi.nix
Normal file
12
common/hidpi.nix
Normal 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
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue