mirror of
https://github.com/NixOS/nixos-hardware.git
synced 2025-11-05 01:37:24 +08: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:
@@ -7,7 +7,7 @@
|
||||
../../../common/gpu/nvidia/ampere
|
||||
../../../common/hidpi.nix
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
|
||||
hardware.nvidia.prime = {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
../../../../common/gpu/nvidia/prime.nix
|
||||
../../../../common/gpu/nvidia/ampere
|
||||
../../../../common/pc/laptop
|
||||
../../../../common/pc/laptop/ssd
|
||||
../../../../common/pc/ssd
|
||||
];
|
||||
|
||||
# Still needs to load at some point if we want X11 to work
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
../../../common/gpu/nvidia/prime.nix
|
||||
../../../common/gpu/nvidia/turing
|
||||
../../../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
|
||||
../../../common/pc/laptop/hdd
|
||||
];
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
../../../../common/gpu/nvidia/prime.nix
|
||||
../../../../common/gpu/nvidia/ampere
|
||||
../../../../common/pc/laptop
|
||||
../../../../common/pc/laptop/ssd
|
||||
../../../../common/pc/ssd
|
||||
../edid
|
||||
];
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
../../../../common/gpu/amd
|
||||
../../../../common/gpu/nvidia/prime.nix
|
||||
../../../../common/pc/laptop
|
||||
../../../../common/pc/laptop/ssd
|
||||
../../../../common/pc/ssd
|
||||
];
|
||||
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
@@ -25,4 +25,4 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
../../../common/gpu/amd
|
||||
../../../common/gpu/nvidia
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
|
||||
# Use latest LTS kernel for more Raphael fixes
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
../../../../common/gpu/nvidia/prime.nix # prime offload
|
||||
../../../../common/gpu/nvidia/ampere # use open drivers
|
||||
../../../../common/pc/laptop
|
||||
../../../../common/pc/laptop/ssd
|
||||
../../../../common/pc/ssd
|
||||
];
|
||||
|
||||
boot.kernelModules = ["amdgpu"];
|
||||
|
||||
@@ -6,6 +6,6 @@
|
||||
../../../../common/gpu/amd
|
||||
../../../../common/gpu/nvidia/disable.nix
|
||||
../../../../common/pc/laptop
|
||||
../../../../common/pc/laptop/ssd
|
||||
../../../../common/pc/ssd
|
||||
];
|
||||
}
|
||||
|
||||
@@ -11,12 +11,12 @@ in
|
||||
../../../common/cpu/amd/pstate.nix
|
||||
../../../common/gpu/amd
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
|
||||
# Kernel 6.10 includes the speaker fix, so only install this on systems with older kernels.
|
||||
boot.extraModulePackages = lib.mkIf (lib.versionOlder config.boot.kernelPackages.kernel.version "6.10") [ lenovo-speaker-fix ];
|
||||
|
||||
|
||||
# √(2560² + 1600²) px / 16 in ≃ 189 dpi
|
||||
services.xserver.dpi = 189;
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
../../../common/gpu/nvidia/prime.nix
|
||||
../../../common/gpu/nvidia/ada-lovelace
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
../../../common/hidpi.nix
|
||||
];
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
../../../common/gpu/nvidia/prime.nix
|
||||
../../../common/gpu/nvidia/ada-lovelace
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
../../../common/hidpi.nix
|
||||
];
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
../../../common/gpu/nvidia/prime.nix
|
||||
../../../common/gpu/nvidia/ampere
|
||||
../../../common/pc/laptop
|
||||
../../../common/pc/laptop/ssd
|
||||
../../../common/pc/ssd
|
||||
../../../common/hidpi.nix
|
||||
];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user