Merge pull request #1469 from bittner/feature/point-to-realpath

Replace symlink references by real path and delete symlink

Author: Mic92

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