aires/nixos-hardware
aires/nixos-hardware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge #622

Browse source 
622: feat: Add focus m2 gen1 r=Mic92 a=ghostbuster91



Co-authored-by: ghostbuster91 <ghostbuster91@users.noreply.github.com>
This commit is contained in:
bors[bot] 2023-05-13 08:03:23 +00:00 committed by GitHub
parent fb13179483 e39036d599
commit 81cd886719
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -124,6 +124,7 @@ See code for all available configurations.
| [Framework](framework) | `<nixos-hardware/framework>` | | [Framework](framework) | `<nixos-hardware/framework>` |
| [Framework 12th Gen Intel Core](framework/12th-gen-intel) | `<nixos-hardware/framework/12th-gen-intel>` | | [Framework 12th Gen Intel Core](framework/12th-gen-intel) | `<nixos-hardware/framework/12th-gen-intel>` |
| [FriendlyARM NanoPC-T4](friendlyarm/nanopc-t4) | `<nixos-hardware/friendlyarm/nanopc-t4>` | | [FriendlyARM NanoPC-T4](friendlyarm/nanopc-t4) | `<nixos-hardware/friendlyarm/nanopc-t4>` |
| [Focus M2 Gen 1](focus/m2/gen1) | `<nixos-hardware/focus/m2/gen1>` |
| [GPD MicroPC](gpd/micropc) | `<nixos-hardware/gpd/micropc>` | | [GPD MicroPC](gpd/micropc) | `<nixos-hardware/gpd/micropc>` |
| [GPD P2 Max](gpd/p2-max) | `<nixos-hardware/gpd/p2-max>` | | [GPD P2 Max](gpd/p2-max) | `<nixos-hardware/gpd/p2-max>` |
| [GPD Pocket 3](gpd/pocket-3) | `<nixos-hardware/gpd/pocket-3>` | | [GPD Pocket 3](gpd/pocket-3) | `<nixos-hardware/gpd/pocket-3>` |

1
flake.nix
View file

@ -58,6 +58,7 @@
framework = import ./framework; framework = import ./framework;
framework-12th-gen-intel = import ./framework/12th-gen-intel; framework-12th-gen-intel = import ./framework/12th-gen-intel;
friendlyarm-nanopc-t4 = import ./friendlyarm/nanopc-t4; friendlyarm-nanopc-t4 = import ./friendlyarm/nanopc-t4;
focus-m2-gen1 = import ./focus/m2/gen1;
google-pixelbook = import ./google/pixelbook; google-pixelbook = import ./google/pixelbook;
gpd-micropc = import ./gpd/micropc; gpd-micropc = import ./gpd/micropc;
gpd-p2-max = import ./gpd/p2-max; gpd-p2-max = import ./gpd/p2-max;

27
focus/m2/gen1/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ lib, ... }:
{
imports = [
../../../common/cpu/intel
../../../common/gpu/nvidia/prime.nix
../../../common/pc/laptop
../../../common/pc/laptop/acpi_call.nix
../../../common/pc/laptop/ssd
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.kernelModules = [ "kvm-intel" ];
boot.blacklistedKernelModules = [ "i2c_nvidia_gpu" ];
hardware.nvidia.modesetting.enable = lib.mkDefault true;
hardware.opengl = {
enable = lib.mkDefault true;
driSupport = lib.mkDefault true;
driSupport32Bit = lib.mkDefault true;
};
hardware.nvidia.prime = {
intelBusId = lib.mkDefault "PCI:0:2:0";
nvidiaBusId = lib.mkDefault "PCI:1:0:0";
};
}