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

system76: Update configs to use the module from Nixpkgs.

Browse source
This commit is contained in:
Bryan Gardiner 2020-10-10 19:33:59 -07:00
parent 602f9d86c6
commit d86324ba69
No known key found for this signature in database
GPG key ID: 53EFBCA063E6183C
2 changed files with 11 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
system76/darp6/default.nix
View file

@ -1,6 +1,14 @@
# Hardware profile for the Darter Pro 6 laptop by System76.
#
# https://system76.com/laptops/darter
#
# Regarding kernel modules, darp6 needs system76-acpi-dkms, not system76-dkms:
#
# [1] https://github.com/pop-os/system76-dkms/issues/39
# jackpot51> system76-acpi-dkms is the correct driver to use on the darp6
#
# system76-io-dkms also appears to be loaded on darp6 with Pop!_OS, and
# system76-dkms does not, and in fact refuses to load.
{ config, lib, options, pkgs, ... }:
let
@ -15,18 +23,10 @@ let
soundSettingsAvailable =
soundSettingsDefined &&
(cfg.soundVendorId != null && cfg.soundSubsystemId != null);
# darp6 needs system76-acpi-dkms, not system76-dkms:
#
# [1] https://github.com/pop-os/system76-dkms/issues/39
# jackpot51> system76-acpi-dkms is the correct driver to use on the darp6
#
# system76-io-dkms also appears to be loaded on darp6 with Pop!_OS, and
# system76-dkms does not, and in fact refuses to load.
packages = with config.boot.kernelPackages; [ system76-acpi system76-io ];
in
{
imports = [
../.
../../common/pc/laptop
../../common/pc/laptop/ssd
];
@ -56,12 +56,6 @@ in
config = lib.mkMerge [
{
boot.extraModulePackages = packages;
# system76_acpi automatically loads on darp6, but system76_io does not.
# Explicitly list all modules to be loaded, for consistency.
boot.kernelModules = map (drv: drv.moduleName) packages;
warnings = lib.optional (!soundSettingsDefined) ''
For full Darter Pro support, set the options:
- hardware.system76.darp76.soundVendorId

13
system76/default.nix
View file

@ -2,21 +2,12 @@
#
# https://system76.com/
{ config, ... }:
let
# Try loading all system76 modules. The ones not relevant to specific
# hardware won't be loaded.
packages = with config.boot.kernelPackages; [ system76 system76-acpi system76-io ];
in
{ config, lib, ... }:
{
imports = [ ../common/pc ];
# This seems to be required for system76-driver.
boot.kernelParams = [ "ec_sys.write_support=1" ];
boot.extraModulePackages = packages;
# Explicitly attempt to load all available system76 modules. Some do
# (system76-acpi), some don't (system76-io).
boot.kernelModules = map (drv: drv.moduleName) packages;
hardware.system76.enableAll = lib.mkDefault true;
}