mirror of
				https://github.com/NixOS/nixos-hardware.git
				synced 2025-11-04 17:27:14 +08:00 
			
		
		
		
	Merge #487
487: add thinkpad x1 yoga 7th-gen r=Mic92 a=MayNiklas Co-authored-by: MayNiklas <info@niklas-steffen.de>
This commit is contained in:
		@@ -164,6 +164,7 @@ See code for all available configurations.
 | 
				
			|||||||
| [Lenovo ThinkPad T550](lenovo/thinkpad/t550)                        | `<nixos-hardware/lenovo/thinkpad/t550>`            |
 | 
					| [Lenovo ThinkPad T550](lenovo/thinkpad/t550)                        | `<nixos-hardware/lenovo/thinkpad/t550>`            |
 | 
				
			||||||
| [Lenovo ThinkPad T590](lenovo/thinkpad/t590)                        | `<nixos-hardware/lenovo/thinkpad/t590>`            |
 | 
					| [Lenovo ThinkPad T590](lenovo/thinkpad/t590)                        | `<nixos-hardware/lenovo/thinkpad/t590>`            |
 | 
				
			||||||
| [Lenovo ThinkPad X1 Yoga](lenovo/thinkpad/x1/yoga)                  | `<nixos-hardware/lenovo/thinkpad/x1/yoga>`         |
 | 
					| [Lenovo ThinkPad X1 Yoga](lenovo/thinkpad/x1/yoga)                  | `<nixos-hardware/lenovo/thinkpad/x1/yoga>`         |
 | 
				
			||||||
 | 
					| [Lenovo ThinkPad X1 Yoga Gen 7](lenovo/thinkpad/x1/yoga/7th-gen/)   | `<nixos-hardware/lenovo/thinkpad/x1/yoga/7th-gen>` |
 | 
				
			||||||
| [Lenovo ThinkPad X1 (6th Gen)](lenovo/thinkpad/x1/6th-gen)          | `<nixos-hardware/lenovo/thinkpad/x1/6th-gen>`      |
 | 
					| [Lenovo ThinkPad X1 (6th Gen)](lenovo/thinkpad/x1/6th-gen)          | `<nixos-hardware/lenovo/thinkpad/x1/6th-gen>`      |
 | 
				
			||||||
| [Lenovo ThinkPad X1 (7th Gen)](lenovo/thinkpad/x1/7th-gen)          | `<nixos-hardware/lenovo/thinkpad/x1/7th-gen>`      |
 | 
					| [Lenovo ThinkPad X1 (7th Gen)](lenovo/thinkpad/x1/7th-gen)          | `<nixos-hardware/lenovo/thinkpad/x1/7th-gen>`      |
 | 
				
			||||||
| [Lenovo ThinkPad X1 (9th Gen)](lenovo/thinkpad/x1/9th-gen)          | `<nixos-hardware/lenovo/thinkpad/x1/9th-gen>`      |
 | 
					| [Lenovo ThinkPad X1 (9th Gen)](lenovo/thinkpad/x1/9th-gen)          | `<nixos-hardware/lenovo/thinkpad/x1/9th-gen>`      |
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -101,6 +101,7 @@
 | 
				
			|||||||
      lenovo-thinkpad-t590 = import ./lenovo/thinkpad/t590;
 | 
					      lenovo-thinkpad-t590 = import ./lenovo/thinkpad/t590;
 | 
				
			||||||
      lenovo-thinkpad-x1 = import ./lenovo/thinkpad/x1;
 | 
					      lenovo-thinkpad-x1 = import ./lenovo/thinkpad/x1;
 | 
				
			||||||
      lenovo-thinkpad-x1-yoga = import ./lenovo/thinkpad/x1/yoga;
 | 
					      lenovo-thinkpad-x1-yoga = import ./lenovo/thinkpad/x1/yoga;
 | 
				
			||||||
 | 
					      lenovo-thinkpad-x1-yoga-7th-gen = import ./lenovo/thinkpad/x1/yoga/7th-gen;
 | 
				
			||||||
      lenovo-thinkpad-x1-6th-gen = import ./lenovo/thinkpad/x1/6th-gen;
 | 
					      lenovo-thinkpad-x1-6th-gen = import ./lenovo/thinkpad/x1/6th-gen;
 | 
				
			||||||
      lenovo-thinkpad-x1-7th-gen = import ./lenovo/thinkpad/x1/7th-gen;
 | 
					      lenovo-thinkpad-x1-7th-gen = import ./lenovo/thinkpad/x1/7th-gen;
 | 
				
			||||||
      lenovo-thinkpad-x1-9th-gen = import ./lenovo/thinkpad/x1/9th-gen;
 | 
					      lenovo-thinkpad-x1-9th-gen = import ./lenovo/thinkpad/x1/9th-gen;
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										14
									
								
								lenovo/thinkpad/x1/yoga/7th-gen/default.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								lenovo/thinkpad/x1/yoga/7th-gen/default.nix
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,14 @@
 | 
				
			|||||||
 | 
					{ lib, pkgs, ... }: {
 | 
				
			||||||
 | 
					  imports = [
 | 
				
			||||||
 | 
					    ../.
 | 
				
			||||||
 | 
					    ../../../../../common/pc/laptop/ssd
 | 
				
			||||||
 | 
					  ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  # This laptop is too new for the kernel currently in nixos-unstable.
 | 
				
			||||||
 | 
					  # On Kernel 5.15.x, dmesg shows the `hardware is newer than drivers` message.
 | 
				
			||||||
 | 
					  # When starting the system with 5.15.x, only a tty is being displayed.
 | 
				
			||||||
 | 
					  # After our tests, at least version 5.19 is required for the system to work properly.
 | 
				
			||||||
 | 
					  boot.kernelPackages = lib.mkIf
 | 
				
			||||||
 | 
					    (lib.versionOlder pkgs.linux.version "5.19")
 | 
				
			||||||
 | 
					    (lib.mkDefault pkgs.linuxPackages_latest);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
		Reference in New Issue
	
	Block a user