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
2025-05-05 11:15:11 +02:00
parent a4bb30a900
commit 7d9552ef6b
113 changed files with 121 additions and 122 deletions

View File

@@ -9,7 +9,7 @@
../../../common/cpu/intel/kaby-lake
../../../common/gpu/amd
../../../common/hidpi.nix
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
# apple smc (TODO: check spi)

View File

@@ -3,6 +3,6 @@
../.
../../common/cpu/intel
../../common/pc/laptop
../../common/pc/laptop/ssd
../../common/pc/ssd
];
}

View File

@@ -3,6 +3,6 @@
../.
../../common/cpu/intel
../../common/pc/laptop
../../common/pc/laptop/ssd
../../common/pc/ssd
];
}

View File

@@ -3,7 +3,7 @@
{
imports = [
../.
../../../common/pc/laptop/ssd
../../../common/pc/ssd
../../../common/gpu/24.05-compat.nix
../../../common/gpu/nvidia/kepler
];

View File

@@ -2,7 +2,7 @@
{
imports = [
../.
../../../common/pc/laptop/ssd
../../../common/pc/ssd
../../../common/cpu/intel/haswell
];

View File

@@ -9,7 +9,7 @@ in
{
imports = [
../.
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
# Enable broadcom-43xx firmware

View File

@@ -3,7 +3,7 @@
{
imports = [
../.
../../../common/pc/laptop/ssd
../../../common/pc/ssd
"${modulesPath}/hardware/network/broadcom-43xx.nix"
];

View File

@@ -8,7 +8,7 @@
../.
../../../common/cpu/intel/kaby-lake
../../../common/hidpi.nix
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
# Make the keyboard work in stage1, enable iommu

View File

@@ -4,7 +4,7 @@
imports = [
../.
../../../common/cpu/intel/sandy-bridge
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
networking.enableB43Firmware = lib.mkDefault true;

View File

@@ -5,7 +5,7 @@
../../../common/cpu/amd/pstate.nix
../../../common/gpu/amd
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
../../battery.nix
];

View File

@@ -8,7 +8,7 @@
../../common/gpu/nvidia/prime.nix
../../common/gpu/nvidia/ampere
../../common/pc/laptop
../../common/pc/laptop/ssd
../../common/pc/ssd
];
hardware.nvidia = {

View File

@@ -7,7 +7,7 @@
imports = [
../../../common/cpu/intel/tiger-lake
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
../../battery.nix
];

View File

@@ -7,7 +7,7 @@
imports = [
../../../common/cpu/intel/comet-lake/cpu-only.nix
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
../../battery.nix
];

View File

@@ -8,7 +8,7 @@
../../../common/gpu/nvidia/prime.nix
../../../common/cpu/intel
../../../common/gpu/intel/comet-lake
../../../common/pc/laptop/ssd
../../../common/pc/ssd
../../../common/hidpi.nix # 4K screen is HiDPI
../../battery.nix
];

View File

@@ -8,7 +8,7 @@
../../../common/gpu/nvidia/prime.nix
../../../common/gpu/nvidia/ampere
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
hardware.nvidia = {

View File

@@ -6,7 +6,7 @@
../../../common/cpu/amd/pstate.nix
../../../common/gpu/amd
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
services = {

View File

@@ -6,7 +6,7 @@
../../../common/gpu/nvidia/prime.nix
../../../common/gpu/nvidia/ada-lovelace
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
../shared/backlight.nix
];

View File

@@ -2,7 +2,7 @@
imports = [
../../common/cpu/intel
../../common/pc/laptop
../../common/pc/laptop/ssd
../../common/pc/ssd
../../common/hidpi.nix
];
# Fixes the display being rotated 90 degrees.

View File

@@ -1 +0,0 @@
../ssd

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -4,6 +4,6 @@
imports = [
../../../common/cpu/intel
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
}

View File

@@ -4,7 +4,7 @@
imports = [
../../../common/cpu/intel
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
# touchpad goes over i2c

View File

@@ -4,7 +4,7 @@
imports = [
../../../common/cpu/intel
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
# Important Firmware

View File

@@ -4,7 +4,7 @@
imports = [
../../../common/cpu/intel
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
# Essential Firmware

View File

@@ -4,6 +4,6 @@
imports = [
../../../common/cpu/intel
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
}

View File

@@ -4,6 +4,6 @@
imports = [
../../../common/cpu/intel/tiger-lake
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
}

View File

@@ -4,7 +4,7 @@
imports = [
../../../common/cpu/intel
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
boot.kernelParams = [

View File

@@ -4,7 +4,7 @@
imports = [
../../../common/cpu/intel
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
boot.kernelParams = [

View File

@@ -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

View File

@@ -2,7 +2,7 @@
{
imports = [
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
../../../common/cpu/intel/tiger-lake
../../../common/gpu/nvidia/turing
];

View File

@@ -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;

View File

@@ -4,7 +4,7 @@
imports = [
../../../common/cpu/intel
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
boot.kernelParams = [ "mem_sleep_default=deep" ];

View File

@@ -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!

View File

@@ -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

View File

@@ -6,7 +6,7 @@ in
imports = [
../../../common/cpu/intel
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
# Boot loader

View File

@@ -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!

View File

@@ -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!

View File

@@ -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!

View File

@@ -6,7 +6,7 @@
../../../common/gpu/nvidia/prime.nix
../../../common/gpu/nvidia/turing
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];

View File

@@ -2,7 +2,7 @@
{
imports = [
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
../../bluetooth.nix
../../kmod.nix
../../framework-tool.nix

View File

@@ -2,7 +2,7 @@
{
imports = [
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
../../bluetooth.nix
../../kmod.nix
../../framework-tool.nix

View File

@@ -3,7 +3,7 @@
{
imports = [
../../common/pc/laptop
../../common/pc/laptop/ssd
../../common/pc/ssd
../../common/cpu/intel/kaby-lake
];
}

View File

@@ -2,7 +2,7 @@
{
imports = [
../../common/pc/laptop
../../common/pc/laptop/ssd
../../common/pc/ssd
];
# Needed to have the keyboard working during the initrd sequence

View File

@@ -1,7 +1,7 @@
{
imports = [
../../common/pc/laptop
../../common/pc/laptop/ssd
../../common/pc/ssd
../../common/cpu/intel/kaby-lake
../../common/hidpi.nix
];

View File

@@ -4,7 +4,7 @@ in
{
imports = [
../../common/pc/laptop
../../common/pc/laptop/ssd
../../common/pc/ssd
../../common/hidpi.nix
../../common/gpu/24.05-compat.nix
];

View File

@@ -4,7 +4,7 @@ in
{
imports = [
../../common/pc/laptop
../../common/pc/laptop/ssd
../../common/pc/ssd
../../common/cpu/amd
../../common/cpu/amd/pstate.nix
../../common/gpu/amd

View File

@@ -3,7 +3,7 @@
imports = [
../../../../common/cpu/intel
../../../../common/pc/laptop
../../../../common/pc/laptop/ssd
../../../../common/pc/ssd
];
# Needed for wifi

View File

@@ -7,7 +7,7 @@
../../../../common/cpu/amd/pstate.nix
../../../../common/gpu/amd
../../../../common/pc/laptop
../../../../common/pc/laptop/ssd
../../../../common/pc/ssd
];
hardware.enableRedistributableFirmware = lib.mkDefault true;

View File

@@ -7,7 +7,7 @@
../../../../common/cpu/amd/pstate.nix
../../../../common/gpu/amd
../../../../common/pc/laptop
../../../../common/pc/laptop/ssd
../../../../common/pc/ssd
];
hardware.enableRedistributableFirmware = lib.mkDefault true;

View File

@@ -7,7 +7,7 @@
../../../../common/cpu/amd/pstate.nix
../../../../common/gpu/amd
../../../../common/pc/laptop
../../../../common/pc/laptop/ssd
../../../../common/pc/ssd
];
hardware.enableRedistributableFirmware = lib.mkDefault true;

View File

@@ -5,7 +5,7 @@
../../../common/cpu/intel/tiger-lake
../../../common/pc
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
config = {

View File

@@ -7,7 +7,7 @@
../../../common/cpu/intel/kaby-lake
../../../common/pc
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
config = {

View File

@@ -8,7 +8,7 @@
../../../common/gpu/nvidia/prime.nix
../../../common/gpu/nvidia/turing
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
hardware.nvidia = {

View File

@@ -5,6 +5,6 @@
../../../common/cpu/amd
../../../common/gpu/amd
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
}

View File

@@ -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.

View File

@@ -8,7 +8,7 @@
../../../common/gpu/nvidia/prime.nix
../../../common/gpu/nvidia/turing
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
hardware.nvidia = {

View File

@@ -6,6 +6,6 @@
../../../common/cpu/amd/pstate.nix
../../../common/gpu/amd
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
}

View File

@@ -4,6 +4,6 @@
imports = [
../../../common/cpu/intel/alder-lake
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
}

View File

@@ -3,6 +3,6 @@
../../../common/cpu/amd
../../../common/gpu/amd
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
}

View File

@@ -7,7 +7,7 @@
../../../common/gpu/nvidia/ampere
../../../common/hidpi.nix
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
hardware.nvidia.prime = {

View File

@@ -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

View File

@@ -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.

View File

@@ -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
];

View File

@@ -9,7 +9,7 @@
../../../../common/gpu/nvidia/prime.nix
../../../../common/gpu/nvidia/ampere
../../../../common/pc/laptop
../../../../common/pc/laptop/ssd
../../../../common/pc/ssd
../edid
];

View File

@@ -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" ];

View File

@@ -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

View File

@@ -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"];

View File

@@ -6,6 +6,6 @@
../../../../common/gpu/amd
../../../../common/gpu/nvidia/disable.nix
../../../../common/pc/laptop
../../../../common/pc/laptop/ssd
../../../../common/pc/ssd
];
}

View File

@@ -11,7 +11,7 @@ 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.

View File

@@ -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
];

View File

@@ -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
];

View File

@@ -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
];

View File

@@ -3,7 +3,7 @@
{
imports = [
../.
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
boot.kernelParams = [

View File

@@ -4,7 +4,7 @@
imports = [
../.
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
boot.kernelParams = [

View File

@@ -2,7 +2,7 @@
{
imports = [
../../../common/cpu/intel
../../../common/pc/laptop/ssd
../../../common/pc/ssd
../.
];

View File

@@ -1,7 +1,7 @@
{
imports = [
../.
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
boot.kernelParams = [

View File

@@ -3,7 +3,7 @@
imports = [
../.
../../../common/cpu/intel/kaby-lake
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
# available cpufreq governors: performance powersave

View File

@@ -4,7 +4,7 @@
# might need nvidia module but we don't know the PCI ids:
# https://github.com/NixOS/nixos-hardware/pull/274#discussion_r650483740
#../../../common/gpu/nvidia/prime.nix
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
# Need to set Thunderbolt to "BIOS Assist Mode"

View File

@@ -6,7 +6,7 @@
imports = [
../.
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
# Force use of the amdgpu driver for backlight control on kernel versions where the

View File

@@ -1,6 +1,6 @@
{
imports = [
../.
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
}

View File

@@ -2,7 +2,7 @@
imports = [
../.
../../../common/cpu/intel/whiskey-lake
../../../common/pc/laptop/ssd
../../../common/pc/ssd
../../../common/gpu/nvidia/pascal
../../../common/gpu/nvidia/prime-sync.nix
];

View File

@@ -3,7 +3,7 @@
{
imports = [
../.
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
# For suspending to RAM to work, set Config -> Power -> Sleep State to "Linux" in EFI.

View File

@@ -2,6 +2,6 @@
imports = [
../.
../../../common/cpu/intel
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
}

View File

@@ -3,6 +3,6 @@
imports = [
../.
../../../common/cpu/intel
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
}

View File

@@ -1,7 +1,7 @@
{
imports = [
../.
../../../../common/pc/laptop/ssd
../../../../common/pc/ssd
];
# Use the right Intel graphics driver

View File

@@ -1,7 +1,7 @@
{
imports = [
../.
../../../../common/pc/laptop/ssd
../../../../common/pc/ssd
];
# Use the right Intel graphics driver

View File

@@ -1,7 +1,7 @@
{
imports = [
../.
../../../../common/pc/laptop/ssd
../../../../common/pc/ssd
];
hardware.trackpoint.device = "TPPS/2 Synaptics TrackPoint";

View File

@@ -3,7 +3,7 @@
imports = [
../.
../../../../common/cpu/intel/haswell
../../../../common/pc/laptop/ssd
../../../../common/pc/ssd
];
services.throttled.enable = lib.mkDefault true;

View File

@@ -10,7 +10,7 @@
imports = [
../.
../../../../common/cpu/intel/kaby-lake
../../../../common/pc/laptop/ssd
../../../../common/pc/ssd
];
# New ThinkPads have a different TrackPoint manufacturer/name.

View File

@@ -2,7 +2,7 @@
{
imports = [
../.
../../../../common/pc/laptop/ssd
../../../../common/pc/ssd
];
services.throttled.enable = lib.mkDefault true;

View File

@@ -2,7 +2,7 @@
{
imports = [
../.
../../../../common/pc/laptop/ssd
../../../../common/pc/ssd
];
# This solves lagging noticeable on high-resolution screens.

View File

@@ -1,7 +1,7 @@
{ lib, pkgs, ... }: {
imports = [
../.
../../../../../common/pc/laptop/ssd
../../../../../common/pc/ssd
];
# At least kernel 5.19 is required for the system to work properly.

View File

@@ -1,6 +1,6 @@
{
imports = [
../.
../../../../../common/pc/laptop/ssd
../../../../../common/pc/ssd
];
}

View File

@@ -1,7 +1,7 @@
{ ... }: {
imports = [
../.
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
# Somehow psmouse does not load automatically on boot for me

View File

@@ -2,7 +2,7 @@
imports = [
../.
../../../common/cpu/intel
../../../common/pc/laptop/ssd
../../../common/pc/ssd
];
boot.kernelParams = [

View File

@@ -4,7 +4,7 @@
imports = [
../.
../../../common/cpu/intel
../../../common/pc/laptop/ssd/default.nix
../../../common/pc/ssd/default.nix
];
services.throttled.enable = lib.mkDefault true;

Some files were not shown because too many files have changed in this diff Show More