nixos-hardware/dell/xps/15-7590/default.nix
Rebecca Turner 74efa57ee4
Support NixOS 19.09 for <dell/xps/15-7590> (#141)
Virtual console options were renamed in 20.03; use `console.earlySetup`
or `boot.earlyVconsoleSetup` depending on OS version.

https://github.com/NixOS/nixos-hardware/pull/114#discussion_r374953204
2020-02-18 11:13:15 +00:00

52 lines
1.6 KiB
Nix

{ lib, ... }:
# Earlier font-size setup.
# Virtual console options were renamed in 20.03; use the right option depending
# on the OS version; keep this here at least until 20.03 is stable.
lib.recursiveUpdate
(if lib.versionAtLeast (lib.versions.majorMinor lib.version) "20.03" then {
console.earlySetup = true;
} else {
boot.earlyVconsoleSetup = true;
}) {
imports = [
../../../common/cpu/intel
../../../common/pc/laptop
../../../common/pc/ssd
];
# Set to true for just the first run, then disable it.
# boot.loader.efi.canTouchEfiVariables = lib.mkDefault true;
# Load GPU drivers.
# hardware.bumblebee.enable = lib.mkDefault true;
# High DPI for X users. 175 "looks reasonable" but I didn't do the actual DPI
# calculation.
# services.xserver.dpi = lib.mkDefault 175;
# Earlier font-size setup
console.earlySetup = true;
# Prevent small EFI partiion from filling up
boot.loader.grub.configurationLimit = 10;
# The 48.ucode causes the Killer wifi card to crash.
# The iwlfwifi-cc-a0-46.ucode works perfectly
nixpkgs.overlays = [
(self: super: {
firmwareLinuxNonfree = super.firmwareLinuxNonfree.overrideAttrs (old: {
src = super.fetchgit {
url =
"https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
rev = "bf13a71b18af229b4c900b321ef1f8443028ded8";
sha256 = "1dcaqdqyffxiadx420pg20157wqidz0c0ca5mrgyfxgrbh6a4mdj";
};
postInstall = ''
rm $out/lib/firmware/iwlwifi-cc-a0-48.ucode
'';
outputHash = "0dq48i1cr8f0qx3nyq50l9w9915vhgpwmwiw3b4yhisbc3afyay4";
});
})
];
}