diff --git a/README.md b/README.md index 06cdf2b..8aa1e64 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ See [CONTRIBUTING.md](./CONTRIBUTING.md). See code for all available configurations. | Model | Path | -| ---------------------------------------------------------------------- | ------------------------------------------------------- | +|------------------------------------------------------------------------|---------------------------------------------------------| | [Acer Aspire 4810T](acer/aspire/4810t) | `` | | [Airis N990](airis/n990) | `` | | [Apple MacBook Air 3,X](apple/macbook-air/3) | `` | @@ -131,6 +131,9 @@ See code for all available configurations. | [Dell XPS 15 9560, intel only](dell/xps/15-9560/intel) | `` | | [Dell XPS 15 9560, nvidia only](dell/xps/15-9560/nvidia) | `` | | [Dell XPS 15 9560](dell/xps/15-9560) | `` | +| [Dell XPS 15 9570, intel only](dell/xps/15-9570/intel) | `` | +| [Dell XPS 15 9570, nvidia](dell/xps/15-9570/nvidia) | `` | +| [Dell XPS 15 9570](dell/xps/15-9570) | `` | | [Dell XPS 17 9700, intel](dell/xps/17-9700/intel) | `` | | [Dell XPS 17 9710, intel only](dell/xps/17-9710/intel) | `` | diff --git a/dell/xps/15-9570/README.wiki b/dell/xps/15-9570/README.wiki new file mode 100644 index 0000000..a820981 --- /dev/null +++ b/dell/xps/15-9570/README.wiki @@ -0,0 +1,30 @@ += Dell XPS 15 9570 = + +== Tested Hardware == + +* CPU: Intel(R) Core(TM) i7-8750H CPU @ 4.10GHz +* RAM: 32 GB +* HDD: 512 GiB SSD +* Screen: 15.6" FHD(1920x1080) non-touchscreen +* Graphics: NVIDIA Corporation GTX1050 Ti Mobile 4GB GDDR5, with Intel Graphics too. +* Input: trackpad, bluetooth mouse and keyboard + + +== Firmware Configuration == + +Not much tweaking of NixOS itself was needed. But we currently cannot automate the firmware setup, so this must be done by hand. + +== Installation == + +=== Before installation === + +These settings are needed both for booting the final install, and installer itself. Therefore, they must be done first. + +* ''Disable Secure Boot (but keep UEFI Boot).'' Thankfully doing so is as easy as changing any other simple setting. + +* ''Disable Intel hardware RAID and use AHCI instead.'' Intel doesn't seem to provide a working linux driver for this. (If you just have SSD it's pointless and just slows things down needlessly anyways.) + + +=== After installation === + +* ''Add systemd-boot to UEFI boot list.'' The (uneditable anyways) settings mapping drive UUIDs to HD* work fine. diff --git a/dell/xps/15-9570/default.nix b/dell/xps/15-9570/default.nix new file mode 100644 index 0000000..200dc09 --- /dev/null +++ b/dell/xps/15-9570/default.nix @@ -0,0 +1,12 @@ +{ lib, ... }: +{ + imports = [ + ../../../common/cpu/intel + ../../../common/cpu/intel/kaby-lake + ../../../common/pc/laptop + ./xps-common.nix + ]; + + # Includes the Wi-Fi and Bluetooth firmware + hardware.enableRedistributableFirmware = lib.mkDefault true; +} diff --git a/dell/xps/15-9570/intel/default.nix b/dell/xps/15-9570/intel/default.nix new file mode 100644 index 0000000..c4d51ea --- /dev/null +++ b/dell/xps/15-9570/intel/default.nix @@ -0,0 +1,8 @@ +{ + imports = [ + ../../../../common/cpu/intel + ../../../../common/pc/laptop + ../../../../common/gpu/nvidia/disable.nix + ../xps-common.nix + ]; +} diff --git a/dell/xps/15-9570/nvidia/default.nix b/dell/xps/15-9570/nvidia/default.nix new file mode 100644 index 0000000..e58fa58 --- /dev/null +++ b/dell/xps/15-9570/nvidia/default.nix @@ -0,0 +1,22 @@ +{ ... }: + +{ + imports = [ + ../../../../common/cpu/intel + ../../../../common/gpu/nvidia/prime.nix + ../../../../common/pc/laptop + ../xps-common.nix + ]; + + + # This runs only nvidia, great for games or heavy use of render applications + + ##### disable intel, run nvidia only and as default + hardware.nvidia.prime = { + # Bus ID of the Intel GPU. + intelBusId = "PCI:0:2:0"; + + # Bus ID of the NVIDIA GPU. + nvidiaBusId = "PCI:1:0:0"; + }; +} diff --git a/dell/xps/15-9570/xps-common.nix b/dell/xps/15-9570/xps-common.nix new file mode 100644 index 0000000..39151e9 --- /dev/null +++ b/dell/xps/15-9570/xps-common.nix @@ -0,0 +1,10 @@ +{ lib, ... }: + +{ + # Solution to rcu_sched freezing + boot.kernelParams = [ "acpi_rev_override" ]; + boot.kernelModules = [ "kvm-intel" ]; + + # This will save you money and possibly your life! + services.thermald.enable = lib.mkDefault true; +} diff --git a/flake.nix b/flake.nix index 7eea41e..a83a008 100644 --- a/flake.nix +++ b/flake.nix @@ -65,6 +65,8 @@ dell-xps-15-9560 = import ./dell/xps/15-9560; dell-xps-15-9560-intel = import ./dell/xps/15-9560/intel; dell-xps-15-9560-nvidia = import ./dell/xps/15-9560/nvidia; + dell-xps-15-9570-intel = import ./dell/xps/15-9570/intel; + dell-xps-15-9570-nvidia = import ./dell/xps/15-9570/nvidia; dell-xps-17-9700-intel = import ./dell/xps/17-9700/intel; dell-xps-17-9700-nvidia = import ./dell/xps/17-9700/nvidia; dell-xps-17-9710-intel = import ./dell/xps/17-9710/intel;