mirror of
https://github.com/NixOS/nixos-hardware.git
synced 2025-11-08 11:36:10 +01:00
Replace symlink references by real path and delete symlink
The common/pc/laptop/ssd folder was apparently moved a level up and was replaced by a symlink to keep things working. We can consolidate this now.
This commit is contained in:
Peter Bittner
parent
a4bb30a900
commit
7d9552ef6b
113 changed files with 121 additions and 122 deletions
|
|
@ -6,7 +6,7 @@
|
|||
../../../common/gpu/nvidia/prime.nix
|
||||
../../../common/gpu/nvidia/pascal
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
|
||||
# Specify bus id of Nvidia and Intel graphics
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
../../../common/gpu/nvidia/prime.nix
|
||||
../../../common/gpu/nvidia/pascal
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
|
||||
# Specify bus id of Nvidia and Intel graphics
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ with lib;
|
|||
../../../common/cpu/amd
|
||||
../../../common/gpu/amd
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
|
||||
# TSC is unstable
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
{
|
||||
imports = [
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
../../../common/gpu/intel/kaby-lake
|
||||
../../../common/gpu/nvidia/maxwell
|
||||
../../../common/gpu/nvidia/prime.nix
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ This configuration uses Nvidia Prime offloading, which allows use of the `nvidia
|
|||
|
||||
#### SSD
|
||||
|
||||
This laptop has an optional M.2 SSD slot, which isn't accounted for here. If you are using the SSD, you could look into implementing the options in [ssd](common/pc/laptop/ssd) manually. Some sources also say you should ensure your SATA Mode is set to AHCI in your BIOS for it to be detected, however I think this is a prerequisite to installing Linux on this laptop in the first place so you probably already have that set.
|
||||
This laptop has an optional M.2 SSD slot, which isn't accounted for here. If you are using the SSD, you could look into implementing the options in [ssd](common/pc/ssd) manually. Some sources also say you should ensure your SATA Mode is set to AHCI in your BIOS for it to be detected, however I think this is a prerequisite to installing Linux on this laptop in the first place so you probably already have that set.
|
||||
|
||||
#### Subwoofer
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
|
||||
# touchpad goes over i2c
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@
|
|||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
|
||||
# Important Firmware
|
||||
hardware.enableRedistributableFirmware = lib.mkDefault true;
|
||||
|
||||
|
||||
boot = {
|
||||
# Kernel Panic on suspend fix, taken from ArchLinux wiki.
|
||||
kernelParams = [ "acpi_enforce_resources=lax" "i915.enable_dc=0" ];
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
|
||||
# Essential Firmware
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@
|
|||
imports = [
|
||||
../../../common/cpu/intel/tiger-lake
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,16 +4,16 @@
|
|||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
|
||||
boot.kernelParams = [
|
||||
boot.kernelParams = [
|
||||
# needed for Intel Iris Xe
|
||||
"i915.force_probe=46a8"
|
||||
"i915.enable_guc=3"
|
||||
"i915.fastboot=1"
|
||||
# needed for keyboard
|
||||
"i8042.dumbkbd=1"
|
||||
"i8042.nopnp=1"
|
||||
"i8042.dumbkbd=1"
|
||||
"i8042.nopnp=1"
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
|
||||
boot.kernelParams = [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
{
|
||||
imports = [
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
../../../common/gpu/nvidia/pascal
|
||||
../../../common/gpu/nvidia/prime.nix
|
||||
../../../common/cpu/intel/coffee-lake
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
{
|
||||
imports = [
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
../../../common/cpu/intel/tiger-lake
|
||||
../../../common/gpu/nvidia/turing
|
||||
];
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
imports = [
|
||||
../../../common/cpu/intel/kaby-lake
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
../../../common/gpu/nvidia
|
||||
];
|
||||
hardware.enableRedistributableFirmware = lib.mkDefault true;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
|
||||
boot.kernelParams = [ "mem_sleep_default=deep" ];
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
|
||||
# This will save you money and possibly your life!
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
imports = [
|
||||
../../../common/cpu/intel/lunar-lake
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
|
||||
# The touchpad uses I²C, so PS/2 is unnecessary
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ in
|
|||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
|
||||
# Boot loader
|
||||
|
|
@ -18,7 +18,7 @@ in
|
|||
# Thermald doesn't have a default config for the 9500 yet, the one in this repo
|
||||
# was generated with dptfxtract-static (https://github.com/intel/dptfxtract)
|
||||
services.thermald.configFile = lib.mkDefault thermald-conf;
|
||||
|
||||
|
||||
# WiFi speed is slow and crashes by default (https://bugzilla.kernel.org/show_bug.cgi?id=213381)
|
||||
# disable_11ax - required until ax driver support is fixed
|
||||
# power_save - works well on this card
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
|
||||
# This will save you money and possibly your life!
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
../../../common/cpu/intel
|
||||
../../../common/gpu/intel/alder-lake
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
|
||||
# This will save you money and possibly your life!
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
imports = [
|
||||
../../../common/cpu/intel
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
|
||||
# This will save you money and possibly your life!
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue