public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #88669 from Mic92/hidpi 

nixos/hidpi: Reasonable defaults for high-density displays
This commit is contained in:
Linus Heckemann 2020-07-22 17:43:03 +02:00 committed by GitHub
parent 714fac4cc9 b6a1dc51d0
commit a5d20d25eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/installation/installing.xml
View File

@ -42,7 +42,7 @@
</para> </para>
<para> <para>
If the text is too small to be legible, try <command>setfont ter-132n</command> If the text is too small to be legible, try <command>setfont ter-v32n</command>
to increase the font size. to increase the font size.
</para> </para>

16
nixos/modules/hardware/video/hidpi.nix Normal file
View File

@ -0,0 +1,16 @@
{ lib, pkgs, config, ...}:
with lib;
{
options.hardware.video.hidpi.enable = mkEnableOption "Font/DPI configuration optimized for HiDPI displays";
config = mkIf config.hardware.video.hidpi.enable {
console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-v32n.psf.gz";
# Needed when typing in passwords for full disk encryption
console.earlySetup = mkDefault true;
boot.loader.systemd-boot.consoleMode = mkDefault "1";
# TODO Find reasonable defaults X11 & wayland
};
}

4
nixos/modules/installer/tools/nixos-generate-config.pl
View File

@ -497,8 +497,8 @@ if (-f $fb_modes_file && -r $fb_modes_file) {
$modes =~ m/([0-9]+)x([0-9]+)/; $modes =~ m/([0-9]+)x([0-9]+)/;
my $console_width = $1, my $console_height = $2; my $console_width = $1, my $console_height = $2;
if ($console_width > 1920) { if ($console_width > 1920) {
push @attrs, "# High-DPI console"; push @attrs, "# high-resolution display";
push @attrs, 'console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";'; push @attrs, 'hardware.video.hidpi.enable = lib.mkDefault true;';
} }
} }

1
nixos/modules/module-list.nix
View File

@ -72,6 +72,7 @@
./hardware/video/capture/mwprocapture.nix ./hardware/video/capture/mwprocapture.nix
./hardware/video/bumblebee.nix ./hardware/video/bumblebee.nix
./hardware/video/displaylink.nix ./hardware/video/displaylink.nix
./hardware/video/hidpi.nix
./hardware/video/nvidia.nix ./hardware/video/nvidia.nix
./hardware/video/uvcvideo/default.nix ./hardware/video/uvcvideo/default.nix
./hardware/video/webcam/facetimehd.nix ./hardware/video/webcam/facetimehd.nix