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.
2025-11-08 02:48:42 +08:00 · 2025-05-05 11:15:11 +02:00
parent a4bb30a900
commit 7d9552ef6b
113 changed files with 121 additions and 122 deletions
--- a/lenovo/ideapad/15ach6/default.nix
+++ b/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 = {
--- a/lenovo/ideapad/15alc6/default.nix
+++ b/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
  ];
 }
--- a/lenovo/ideapad/15arh05/default.nix
+++ b/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.
--- a/lenovo/ideapad/16ach6/default.nix
+++ b/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 = {
--- a/lenovo/ideapad/16ahp9/default.nix
+++ b/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
  ];
 }
--- a/lenovo/ideapad/16iah8/default.nix
+++ b/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
  ];
 }
--- a/lenovo/ideapad/slim-5/default.nix
+++ b/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
  ];
 }
--- a/lenovo/legion/15ach6/default.nix
+++ b/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 = {
--- a/lenovo/legion/15ach6h/hybrid/default.nix
+++ b/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
--- a/lenovo/legion/15arh05h/default.nix
+++ b/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.
--- a/lenovo/legion/15ich/default.nix
+++ b/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
  ];

--- a/lenovo/legion/16ach6h/hybrid/default.nix
+++ b/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
  ];

--- a/lenovo/legion/16achg6/hybrid/default.nix
+++ b/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 @@
      };
    };
  };
-}
+}
--- a/lenovo/legion/16aph8/default.nix
+++ b/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
--- a/lenovo/legion/16arh7h/hybrid/default.nix
+++ b/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"];
--- a/lenovo/legion/16arh7h/igpu-only/default.nix
+++ b/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
  ];
 }
--- a/lenovo/legion/16arha7/default.nix
+++ b/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;

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

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

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

--- a/lenovo/thinkpad/e14/default.nix
+++ b/lenovo/thinkpad/e14/default.nix
@@ -3,7 +3,7 @@
 {
  imports = [
    ../.
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
  ];

  boot.kernelParams = [
--- a/lenovo/thinkpad/e15/default.nix
+++ b/lenovo/thinkpad/e15/default.nix
@@ -4,7 +4,7 @@
  imports = [
    ../.
    ../../../common/pc/laptop
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
  ];

  boot.kernelParams = [
--- a/lenovo/thinkpad/l13/default.nix
+++ b/lenovo/thinkpad/l13/default.nix
@@ -2,7 +2,7 @@
 {
  imports = [
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
    ../.
  ];

--- a/lenovo/thinkpad/l14/default.nix
+++ b/lenovo/thinkpad/l14/default.nix
@@ -1,7 +1,7 @@
 {
  imports = [
    ../.
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
  ];

  boot.kernelParams = [
--- a/lenovo/thinkpad/l480/default.nix
+++ b/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
--- a/lenovo/thinkpad/p1/default.nix
+++ b/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"
--- a/lenovo/thinkpad/p14s/default.nix
+++ b/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
--- a/lenovo/thinkpad/p16s/default.nix
+++ b/lenovo/thinkpad/p16s/default.nix
@@ -1,6 +1,6 @@
 {
  imports = [
    ../.
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
  ];
 }
--- a/lenovo/thinkpad/p43s/default.nix
+++ b/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
  ];
--- a/lenovo/thinkpad/t14/default.nix
+++ b/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.
--- a/lenovo/thinkpad/x1-extreme/default.nix
+++ b/lenovo/thinkpad/x1-extreme/default.nix
@@ -2,6 +2,6 @@
  imports = [
    ../.
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
  ];
 }
--- a/lenovo/thinkpad/x1-nano/default.nix
+++ b/lenovo/thinkpad/x1-nano/default.nix
@@ -3,6 +3,6 @@
  imports = [
    ../.
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
  ];
 }
--- a/lenovo/thinkpad/x1/10th-gen/default.nix
+++ b/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
--- a/lenovo/thinkpad/x1/11th-gen/default.nix
+++ b/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
--- a/lenovo/thinkpad/x1/12th-gen/default.nix
+++ b/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";
--- a/lenovo/thinkpad/x1/2nd-gen/default.nix
+++ b/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;
--- a/lenovo/thinkpad/x1/6th-gen/default.nix
+++ b/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.
--- a/lenovo/thinkpad/x1/7th-gen/default.nix
+++ b/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;
--- a/lenovo/thinkpad/x1/9th-gen/default.nix
+++ b/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.
--- a/lenovo/thinkpad/x1/yoga/7th-gen/default.nix
+++ b/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.
--- a/lenovo/thinkpad/x1/yoga/8th-gen/default.nix
+++ b/lenovo/thinkpad/x1/yoga/8th-gen/default.nix
@@ -1,6 +1,6 @@
 {
  imports = [
    ../.
-    ../../../../../common/pc/laptop/ssd
+    ../../../../../common/pc/ssd
  ];
 }
--- a/lenovo/thinkpad/x13/common.nix
+++ b/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
--- a/lenovo/thinkpad/x270/default.nix
+++ b/lenovo/thinkpad/x270/default.nix
@@ -2,7 +2,7 @@
  imports = [
    ../.
    ../../../common/cpu/intel
-    ../../../common/pc/laptop/ssd
+    ../../../common/pc/ssd
  ];

  boot.kernelParams = [
--- a/lenovo/thinkpad/x280/default.nix
+++ b/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;
--- a/lenovo/thinkpad/x390/default.nix
+++ b/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;
--- a/lenovo/thinkpad/z/default.nix
+++ b/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;