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.

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;

lenovo/thinkpad/x390/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;

lenovo/thinkpad/z/default.nix

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