diff --git a/README.md b/README.md index 4e0d41b..9b2338a 100644 --- a/README.md +++ b/README.md @@ -72,11 +72,11 @@ See code for all available configurations. | [Apple MacBook Air 3,X](apple/macbook-air/3) | `` | | [Apple MacBook Air 4,X](apple/macbook-air/4) | `` | | [Apple MacBook Air 6,X](apple/macbook-air/6) | `` | -| [Apple MacBook Pro 12,1](apple/macbook-pro/12-1) | `` | | [Apple MacBook Pro 10,1](apple/macbook-pro/10-1) | `` | -| [Asus TUF FX504GD](asus/fx504gd) | `` | +| [Apple MacBook Pro 12,1](apple/macbook-pro/12-1) | `` | | [Asus ROG Strix G733QS](asus/rog-strix/g733qs) | `` | | [Asus ROG Zephyrus G14 GA401](asus/zephyrus/ga401) | `` | +| [Asus TUF FX504GD](asus/fx504gd) | `` | | [BeagleBoard PocketBeagle](beagleboard/pocketbeagle) | `` | | [Dell G3 3779](dell/g3/3779) | `` | | [Dell Inspiron 5509](dell/inspiron/5509) | `` | @@ -85,7 +85,6 @@ See code for all available configurations. | [Dell Latitude 7490](dell/latitude/7490) | `` | | [Dell Poweredge R7515](dell/poweredge/r7515) | `` | | [Dell Precision 5530](dell/precision/5530) | `` | -| [Dell XPS E7240](dell/e7240) | `` | | [Dell XPS 13 7390](dell/xps/13-7390) | `` | | [Dell XPS 13 9310](dell/xps/13-9310) | `` | | [Dell XPS 13 9343](dell/xps/13-9343) | `` | @@ -93,42 +92,44 @@ See code for all available configurations. | [Dell XPS 13 9370](dell/xps/13-9370) | `` | | [Dell XPS 13 9380](dell/xps/13-9380) | `` | | [Dell XPS 15 7590](dell/xps/15-7590) | `` | -| [Dell XPS 15 9550](dell/xps/15-9550) | `` | +| [Dell XPS 15 9500, nvidia](dell/xps/15-9500/nvidia) | `` | +| [Dell XPS 15 9500](dell/xps/15-9500) | `` | | [Dell XPS 15 9550, nvidia](dell/xps/15-9550/nvidia) | `` | -| [Dell XPS 15 9560](dell/xps/15-9560) | `` | +| [Dell XPS 15 9550](dell/xps/15-9550) | `` | | [Dell XPS 15 9560, intel only](dell/xps/15-9560/intel) | `` | | [Dell XPS 15 9560, nvidia only](dell/xps/15-9560/nvidia) | `` | -| [Dell XPS 15 9500](dell/xps/15-9500) | `` | -| [Dell XPS 15 9500, nvidia](dell/xps/15-9500/nvidia) | `` | +| [Dell XPS 15 9560](dell/xps/15-9560) | `` | | [Dell XPS 17 9710, intel only](dell/xps/17-9710/intel) | `` | +| [Dell XPS E7240](dell/e7240) | `` | | [FriendlyARM NanoPC-T4](friendlyarm/nanopc-t4) | `` | +| [GPD MicroPC](gpd/micropc) | `` | | [Google Pixelbook](google/pixelbook) | `` | | [HP Elitebook 2560p](hp/elitebook/2560p) | `` | -| [GPD MicroPC](gpd/micropc) | `` | | [Intel NUC 8i7BEH](intel/nuc/8i7beh/) | `` | | [Lenovo IdeaPad Z510](lenovo/ideapad/z510) | `` | -| [Lenovo ThinkPad E14 (Intel)](lenovo/thinkpad/e14/intel) | `` | +| [Lenovo Legion 5 15arh05h](lenovo/legion/15arh05h) | `` | | [Lenovo ThinkPad E14 (AMD)](lenovo/thinkpad/e14/amd) | `` | +| [Lenovo ThinkPad E14 (Intel)](lenovo/thinkpad/e14/intel) | `` | | [Lenovo ThinkPad E470](lenovo/thinkpad/e470) | `` | | [Lenovo ThinkPad E495](lenovo/thinkpad/e495) | `` | -| [Lenovo ThinkPad L13](lenovo/thinkpad/l13) | `` | | [Lenovo ThinkPad L13 Yoga](lenovo/thinkpad/l13/yoga) | `` | -| [Lenovo ThinkPad L14 (Intel)](lenovo/thinkpad/l14/intel) | `` | +| [Lenovo ThinkPad L13](lenovo/thinkpad/l13) | `` | | [Lenovo ThinkPad L14 (AMD)](lenovo/thinkpad/l14/amd) | `` | -| [Lenovo ThinkPad P1](thinkpad/p1) | `` | +| [Lenovo ThinkPad L14 (Intel)](lenovo/thinkpad/l14/intel) | `` | | [Lenovo ThinkPad P1 Gen 3](lenovo/thinkpad/p1/3th-gen) | `` | | [Lenovo ThinkPad P14s AMD Gen 2](lenovo/thinkpad/p14s/amd/gen2) | `` | +| [Lenovo ThinkPad P1](thinkpad/p1) | `` | | [Lenovo ThinkPad P53](lenovo/thinkpad/p53) | `` | -| [Lenovo ThinkPad T14](lenovo/thinkpad/t14) | `` | -| [Lenovo ThinkPad T14s](lenovo/thinkpad/t14s) | `` | | [Lenovo ThinkPad T14 AMD Gen 1](lenovo/thinkpad/t14/amd/gen1) | `` | | [Lenovo ThinkPad T14 AMD Gen 2](lenovo/thinkpad/t14/amd/gen2) | `` | +| [Lenovo ThinkPad T14](lenovo/thinkpad/t14) | `` | | [Lenovo ThinkPad T14s AMD Gen 1](lenovo/thinkpad/t14s/amd/gen1) | `` | +| [Lenovo ThinkPad T14s](lenovo/thinkpad/t14s) | `` | | [Lenovo ThinkPad T410](lenovo/thinkpad/t410) | `` | | [Lenovo ThinkPad T420](lenovo/thinkpad/t420) | `` | | [Lenovo ThinkPad T430](lenovo/thinkpad/t430) | `` | -| [Lenovo ThinkPad T440s](lenovo/thinkpad/t440s) | `` | | [Lenovo ThinkPad T440p](lenovo/thinkpad/t440p) | `` | +| [Lenovo ThinkPad T440s](lenovo/thinkpad/t440s) | `` | | [Lenovo ThinkPad T450s](lenovo/thinkpad/t450s) | `` | | [Lenovo ThinkPad T460](lenovo/thinkpad/t460) | `` | | [Lenovo ThinkPad T460s](lenovo/thinkpad/t460s) | `` | @@ -138,7 +139,12 @@ See code for all available configurations. | [Lenovo ThinkPad T490](lenovo/thinkpad/t490) | `` | | [Lenovo ThinkPad T495](lenovo/thinkpad/t495) | `` | | [Lenovo ThinkPad T550](lenovo/thinkpad/t550) | `` | +| [Lenovo ThinkPad X1 (6th Gen)](lenovo/thinkpad/x1/6th-gen) | `` | +| [Lenovo ThinkPad X1 (7th Gen)](lenovo/thinkpad/x1/7th-gen) | `` | +| [Lenovo ThinkPad X1 (9th Gen)](lenovo/thinkpad/x1/9th-gen) | `` | +| [Lenovo ThinkPad X1 Extreme Gen 2](lenovo/thinkpad/x1-extreme/gen2) | `` | | [Lenovo ThinkPad X13 Yoga](lenovo/thinkpad/x13/yoga) | `` | +| [Lenovo ThinkPad X13](lenovo/thinkpad/x13) | `` | | [Lenovo ThinkPad X140e](lenovo/thinkpad/x140e) | `` | | [Lenovo ThinkPad X200s](lenovo/thinkpad/x200s) | `` | | [Lenovo ThinkPad X220](lenovo/thinkpad/x220) | `` | @@ -147,21 +153,16 @@ See code for all available configurations. | [Lenovo ThinkPad X260](lenovo/thinkpad/x260) | `` | | [Lenovo ThinkPad X270](lenovo/thinkpad/x270) | `` | | [Lenovo ThinkPad X280](lenovo/thinkpad/x280) | `` | -| [Lenovo ThinkPad X1 (6th Gen)](lenovo/thinkpad/x1/6th-gen) | `` | -| [Lenovo ThinkPad X1 (7th Gen)](lenovo/thinkpad/x1/7th-gen) | `` | -| [Lenovo ThinkPad X1 (9th Gen)](lenovo/thinkpad/x1/9th-gen) | `` | -| [Lenovo ThinkPad X1 Extreme Gen 2](lenovo/thinkpad/x1-extreme/gen2) | `` | -| [Lenovo ThinkPad X13](lenovo/thinkpad/x13) | `` | -| [One-Netbook OneNetbook 4](onenetbook/4) | `` | -| [Microsoft Surface Range](microsoft/surface) | `` | -| [Microsoft Surface Pro 3](microsoft/surface-pro/3) | `` | | [MSI GS60 2QE](msi/gs60) | `` | +| [Microsoft Surface Pro 3](microsoft/surface-pro/3) | `` | +| [Microsoft Surface Range](microsoft/surface) | `` | +| [One-Netbook OneNetbook 4](onenetbook/4) | `` | | [PC Engines APU](pcengines/apu) | `` | +| [Purism Librem 13v3](purism/librem/13v3) | `` | +| [Purism Librem 15v3](purism/librem/13v3) | `` | | [Raspberry Pi 2](raspberry-pi/2) | `` | | [Raspberry Pi 4](raspberry-pi/4) | `` | | [Samsung Series 9 NP900X3C](samsung/np900x3c) | `` | -| [Purism Librem 13v3](purism/librem/13v3) | `` | -| [Purism Librem 15v3](purism/librem/13v3) | `` | | [Supermicro A1SRi-2758F](supermicro/a1sri-2758f) | `` | | [Supermicro M11SDV-8C-LN4F](supermicro/m11sdv-8c-ln4f) | `` | | [Supermicro X10SLL-F](supermicro/x10sll-f) | `` | diff --git a/common/gpu/nvidia-disable.nix b/common/gpu/nvidia-disable.nix index f2e2158..c6516af 100644 --- a/common/gpu/nvidia-disable.nix +++ b/common/gpu/nvidia-disable.nix @@ -1,7 +1,7 @@ { lib, pkgs, ... }: { - # This runs only Intel and nvidia does not drain power. + # This runs only intel/amdgpu igpus and nvidia dgpus do not drain power. ##### disable nvidia, very nice battery life. hardware.nvidiaOptimus.disable = lib.mkDefault true; diff --git a/flake.nix b/flake.nix index 329c832..f8b88d4 100644 --- a/flake.nix +++ b/flake.nix @@ -16,14 +16,14 @@ asus-rog-strix-g733qs = import ./asus/rog-strix/g733qs; asus-zephyrus-ga401 = import ./asus/zephyrus/ga401; beagleboard-pocketbeagle = import ./beagleboard/pocketbeagle; + dell-e7240 = import ./dell/e7240; dell-g3-3779 = import ./dell/g3/3779; dell-inspiron-5509 = import ./dell/inspiron/5509; dell-inspiron-5515 = import ./dell/inspiron/5515; dell-latitude-3480 = import ./dell/latitude/3480; dell-latitude-7490 = import ./dell/latitude/7490; - dell-precision-5530 = import ./dell/precision/5530; dell-poweredge-r7515 = import ./dell/poweredge/r7515; - dell-e7240 = import ./dell/e7240; + dell-precision-5530 = import ./dell/precision/5530; dell-xps-13-7390 = import ./dell/xps/13-7390; dell-xps-13-9310 = import ./dell/xps/13-9310; dell-xps-13-9343 = import ./dell/xps/13-9343; @@ -31,13 +31,13 @@ dell-xps-13-9370 = import ./dell/xps/13-9370; dell-xps-13-9380 = import ./dell/xps/13-9380; dell-xps-15-7590 = import ./dell/xps/15-7590; + dell-xps-15-9500 = import ./dell/xps/15-9500; + dell-xps-15-9500-nvidia = import ./dell/xps/15-9500/nvidia; dell-xps-15-9550 = import ./dell/xps/15-9550; dell-xps-15-9550-nvidia = import ./dell/xps/15-9550/nvidia; dell-xps-15-9560 = import ./dell/xps/15-9560; dell-xps-15-9560-intel = import ./dell/xps/15-9560/intel; dell-xps-15-9560-nvidia = import ./dell/xps/15-9560/nvidia; - dell-xps-15-9500 = import ./dell/xps/15-9500; - dell-xps-15-9500-nvidia = import ./dell/xps/15-9500/nvidia; dell-xps-17-9710-intel = import ./dell/xps/17-9710/intel; friendlyarm-nanopc-t4 = import ./friendlyarm/nanopc-t4; google-pixelbook = import ./google/pixelbook; @@ -45,15 +45,16 @@ hp-elitebook-2560p = import ./hp/elitebook/2560p; intel-nuc-8i7beh = import ./intel/nuc/8i7beh; lenovo-ideapad-z510 = import ./lenovo/ideapad/z510; + lenovo-legion-15arh05h = import ./lenovo/legion/15arh05h; lenovo-thinkpad = import ./lenovo/thinkpad; - lenovo-thinkpad-e14-intel = import ./lenovo/thinkpad/e14/intel; lenovo-thinkpad-e14-amd = import ./lenovo/thinkpad/e14/amd; + lenovo-thinkpad-e14-intel = import ./lenovo/thinkpad/e14/intel; lenovo-thinkpad-e470 = import ./lenovo/thinkpad/e470; lenovo-thinkpad-e495 = import ./lenovo/thinkpad/e495; lenovo-thinkpad-l13 = import ./lenovo/thinkpad/l13; lenovo-thinkpad-l13-yoga = import ./lenovo/thinkpad/l13/yoga; - lenovo-thinkpad-l14-intel = import ./lenovo/thinkpad/l14/intel; lenovo-thinkpad-l14-amd = import ./lenovo/thinkpad/l14/amd; + lenovo-thinkpad-l14-intel = import ./lenovo/thinkpad/l14/intel; lenovo-thinkpad-p1 = import ./lenovo/thinkpad/p1; lenovo-thinkpad-p1-gen3 = import ./lenovo/thinkpad/p1/3th-gen; lenovo-thinkpad-p14s-amd-gen2 = import ./lenovo/thinkpad/p14s/amd/gen2; @@ -112,22 +113,23 @@ system76-darp6 = import ./system76/darp6; toshiba-swanky = import ./toshiba/swanky; tuxedo-infinitybook-v4 = import ./tuxedo/infinitybook/v4; + common-cpu-amd = import ./common/cpu/amd; common-cpu-intel = import ./common/cpu/intel; common-cpu-intel-kaby-lake = import ./common/cpu/intel/kaby-lake; common-cpu-intel-sandy-bridge = import ./common/cpu/intel/sandy-bridge; - common-gpu-nvidia = import ./common/gpu/nvidia.nix; - common-gpu-nvidia-disable = import ./common/gpu/nvidia-disable.nix; common-gpu-amd = import ./common/gpu/amd; common-gpu-amd-sea-islands = import ./common/gpu/amd/sea-islands; common-gpu-amd-southern-islands = import ./common/gpu/amd/southern-islands; + common-gpu-nvidia = import ./common/gpu/nvidia.nix; + common-gpu-nvidia-disable = import ./common/gpu/nvidia-disable.nix; + common-pc = import ./common/pc; common-pc-hdd = import ./common/pc/hdd; + common-pc-laptop = import ./common/pc/laptop; + common-pc-laptop-acpi_call = import ./common/pc/laptop/acpi_call.nix; common-pc-laptop-hdd = import ./common/pc/laptop/hdd; common-pc-laptop-ssd = import ./common/pc/ssd; - common-pc-laptop-acpi_call = import ./common/pc/laptop/acpi_call.nix; - common-pc-laptop = import ./common/pc/laptop; common-pc-ssd = import ./common/pc/ssd; - common-pc = import ./common/pc; }; }; } diff --git a/lenovo/legion/15arh05h/default.nix b/lenovo/legion/15arh05h/default.nix new file mode 100644 index 0000000..1662748 --- /dev/null +++ b/lenovo/legion/15arh05h/default.nix @@ -0,0 +1,20 @@ +{ lib, pkgs, ... }: + +{ + imports = [ + ../../../common/cpu/amd + ../../../common/gpu/nvidia.nix + ../../../common/pc/laptop + ../../../common/pc/laptop/ssd + ]; + + # Specify bus id of Nvidia and Intel graphics. + hardware.nvidia.prime = { + amdgpuBusId = "PCI:6:0:0"; + nvidiaBusId = "PCI:1:0:0"; + }; + + # Cooling management + services.thermald.enable = lib.mkDefault true; + +}