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.

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 = [ 
-    # These options are needed for suspend to work, 
+  boot.kernelParams = [
+    # 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
   ];