From d86324ba69da76cb9ceb87000172ebb896947a03 Mon Sep 17 00:00:00 2001
From: Bryan Gardiner <bog@khumba.net>
Date: Sat, 10 Oct 2020 19:33:59 -0700
Subject: [PATCH] system76: Update configs to use the module from Nixpkgs.

---
 system76/darp6/default.nix | 24 +++++++++---------------
 system76/default.nix       | 13 ++-----------
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/system76/darp6/default.nix b/system76/darp6/default.nix
index 552c5e9..3f93993 100644
--- a/system76/darp6/default.nix
+++ b/system76/darp6/default.nix
@@ -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
diff --git a/system76/default.nix b/system76/default.nix
index 64b1032..e09a989 100644
--- a/system76/default.nix
+++ b/system76/default.nix
@@ -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;
 }