summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2020-04-29 17:20:49 +0100
committerGitHub <noreply@github.com>2020-04-29 17:20:49 +0100
commitb0196caceca16d1bc745f473c6683e5dd0cadb0f (patch)
treec3bc849e6411dc65b32ed088fdedb481ffc9eb97
parent26d3ae2f240ae85f27d566e78f7732b6aecec686 (diff)
parent34f242c13d6aa02e21caeeb74d2c6016c53ca863 (diff)
downloadnixpkgs-b0196caceca16d1bc745f473c6683e5dd0cadb0f.tar
nixpkgs-b0196caceca16d1bc745f473c6683e5dd0cadb0f.tar.gz
nixpkgs-b0196caceca16d1bc745f473c6683e5dd0cadb0f.tar.bz2
nixpkgs-b0196caceca16d1bc745f473c6683e5dd0cadb0f.tar.lz
nixpkgs-b0196caceca16d1bc745f473c6683e5dd0cadb0f.tar.xz
nixpkgs-b0196caceca16d1bc745f473c6683e5dd0cadb0f.tar.zst
nixpkgs-b0196caceca16d1bc745f473c6683e5dd0cadb0f.zip
Merge pull request #84476 from jakobrs/installation-cd-base-terminus
-rw-r--r--nixos/doc/manual/installation/installing.xml5
-rw-r--r--nixos/modules/installer/cd-dvd/installation-cd-base.nix5
2 files changed, 9 insertions, 1 deletions
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 0dbfb39c32b..673df8f2e4c 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -41,6 +41,11 @@
    neo</command>!)
   </para>
 
+  <para>
+   If the text is too small to be legible, try <command>setfont ter-132n</command>
+   to increase the font size.
+  </para>
+
   <section xml:id="sec-installation-booting-networking">
    <title>Networking in the installer</title>
 
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
index 9303e8fde13..6c7ea293e8a 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
@@ -1,7 +1,7 @@
 # This module contains the basic configuration for building a NixOS
 # installation CD.
 
-{ config, lib, pkgs, ... }:
+{ config, lib, options, pkgs, ... }:
 
 with lib;
 
@@ -15,6 +15,9 @@ with lib;
       ../../profiles/installation-device.nix
     ];
 
+  # Adds terminus_font for people with HiDPI displays
+  console.packages = options.console.packages.default ++ [ pkgs.terminus_font ];
+
   # ISO naming.
   isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.iso";