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.

apple/imac/18-2/default.nix

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

apple/imac/default.nix

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

apple/macbook-air/default.nix

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

apple/macbook-pro/10-1/default.nix

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

apple/macbook-pro/11-1/default.nix

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

apple/macbook-pro/11-5/default.nix

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

apple/macbook-pro/12-1/default.nix

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

apple/macbook-pro/14-1/default.nix

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

apple/macbook-pro/8-1/default.nix

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

asus/ally/rc71l/default.nix

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

asus/fa506ic/default.nix

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

asus/zenbook/ux371/default.nix

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

asus/zenbook/ux481/shared.nix

@@ -7,12 +7,12 @@
   imports = [
     ../../../common/cpu/intel/comet-lake/cpu-only.nix
     ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
     ../../battery.nix
   ];
 
-  boot.kernelParams = [ 
+  boot.kernelParams = [
-    # These options are needed for suspend to work, 
+    # These options are needed for suspend to work,
     # otherwise the nvme will be mounted read-only on resume
     "pcie_aspm=off"
     "pcie_port_pm=off"

asus/zenbook/ux535/default.nix

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

asus/zephyrus/ga401/default.nix

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

asus/zephyrus/ga402/default.nix

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

asus/zephyrus/gu605my/default.nix

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

chuwi/minibook-x/default.nix

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

common/pc/laptop/ssd

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

dell/g3/3579/default.nix

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

dell/g3/3779/default.nix

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

dell/inspiron/7405/default.nix

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

dell/inspiron/7460/default.nix

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

dell/inspiron/7559/README.md

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

dell/latitude/3340/default.nix

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

dell/latitude/3480/default.nix

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

dell/latitude/5490/default.nix

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

dell/latitude/5520/default.nix

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

dell/latitude/7280/default.nix

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

dell/latitude/7420/default.nix

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

dell/latitude/7430/default.nix

@@ -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.dumbkbd=1"
-    "i8042.nopnp=1" 
+    "i8042.nopnp=1"
   ];
 }

dell/latitude/9430/default.nix

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

dell/precision/5530/default.nix

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

dell/precision/5560/default.nix

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

dell/precision/7520/default.nix

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

dell/xps/13-7390/default.nix

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

dell/xps/13-9343/default.nix

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

dell/xps/13-9350/default.nix

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

dell/xps/15-9500/default.nix

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

dell/xps/15-9510/default.nix

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

dell/xps/15-9520/default.nix

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

dell/xps/15-9530/default.nix

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

focus/m2/gen1/default.nix

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

framework/13-inch/common/default.nix

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

framework/16-inch/common/default.nix

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

google/pixelbook/default.nix

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

gpd/micropc/default.nix

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

gpd/p2-max/default.nix

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

gpd/pocket-3/default.nix

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

gpd/pocket-4/default.nix

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

hp/elitebook/830/g6/default.nix

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

hp/elitebook/845/g7/default.nix

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

hp/elitebook/845/g8/default.nix

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

hp/elitebook/845/g9/default.nix

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

hp/laptop/14s-dq2024nf/default.nix

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

hp/probook/440G5/default.nix

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

lenovo/ideapad/15ach6/default.nix

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

lenovo/ideapad/15alc6/default.nix

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

lenovo/ideapad/15arh05/default.nix

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

lenovo/ideapad/16ach6/default.nix

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

lenovo/ideapad/16ahp9/default.nix

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

lenovo/ideapad/16iah8/default.nix

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

lenovo/ideapad/slim-5/default.nix

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

lenovo/legion/15ach6/default.nix

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

lenovo/legion/15ach6h/hybrid/default.nix

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

lenovo/legion/15arh05h/default.nix

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

lenovo/legion/15ich/default.nix

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

lenovo/legion/16ach6h/hybrid/default.nix

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

lenovo/legion/16achg6/hybrid/default.nix

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

lenovo/legion/16aph8/default.nix

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

lenovo/legion/16arh7h/hybrid/default.nix

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

lenovo/legion/16arh7h/igpu-only/default.nix

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

lenovo/legion/16arha7/default.nix

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

lenovo/legion/16irx8h/default.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
   ];
 

lenovo/legion/16irx9h/default.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
   ];
 

lenovo/legion/16ithg6/default.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
   ];
 

lenovo/thinkpad/e14/default.nix

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

lenovo/thinkpad/e15/default.nix

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

lenovo/thinkpad/l13/default.nix

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

lenovo/thinkpad/l14/default.nix

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

lenovo/thinkpad/l480/default.nix

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

lenovo/thinkpad/p1/default.nix

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

lenovo/thinkpad/p14s/default.nix

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

lenovo/thinkpad/p16s/default.nix

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

lenovo/thinkpad/p43s/default.nix

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

lenovo/thinkpad/t14/default.nix

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

lenovo/thinkpad/x1-extreme/default.nix

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

lenovo/thinkpad/x1-nano/default.nix

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

lenovo/thinkpad/x1/10th-gen/default.nix

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

lenovo/thinkpad/x1/11th-gen/default.nix

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

lenovo/thinkpad/x1/12th-gen/default.nix

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

lenovo/thinkpad/x1/2nd-gen/default.nix

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

lenovo/thinkpad/x1/6th-gen/default.nix

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

lenovo/thinkpad/x1/7th-gen/default.nix

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

lenovo/thinkpad/x1/9th-gen/default.nix

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

lenovo/thinkpad/x1/yoga/7th-gen/default.nix

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

lenovo/thinkpad/x1/yoga/8th-gen/default.nix

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

lenovo/thinkpad/x13/common.nix

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

lenovo/thinkpad/x270/default.nix

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

lenovo/thinkpad/x280/default.nix

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