hwModules: simplify device specific imports
Some checks are pending
nix-build / default-build (push) Waiting to run
nix-build / fallarbor-build (push) Waiting to run
nix-build / lavaridge-build (push) Waiting to run
nix-build / mauville-build (push) Waiting to run
nix-build / pacifidlog-build (push) Waiting to run
nix-build / petalburg-build (push) Waiting to run
nix-build / rustboro-build (push) Waiting to run
nix-build / slateport-build (push) Waiting to run
nix-check / fmt-check (push) Waiting to run
nix-check / eval-check (push) Waiting to run

This commit is contained in:
Aly Raffauf 2024-10-14 19:13:27 -04:00
parent 1e41b73fb2
commit 7984aad5d9
6 changed files with 27 additions and 29 deletions

View file

@ -162,7 +162,6 @@
hw-common-intel-cpu = import ./hwModules/common/cpu/intel; hw-common-intel-cpu = import ./hwModules/common/cpu/intel;
hw-common-intel-gpu = import ./hwModules/common/gpu/intel; hw-common-intel-gpu = import ./hwModules/common/gpu/intel;
hw-common-laptop = import ./hwModules/common/laptop; hw-common-laptop = import ./hwModules/common/laptop;
hw-common-laptop-amd-gpu = import ./hwModules/common/laptop/amd-gpu.nix;
hw-common-laptop-intel-cpu = import ./hwModules/common/laptop/intel-cpu.nix; hw-common-laptop-intel-cpu = import ./hwModules/common/laptop/intel-cpu.nix;
hw-common-ssd = import ./hwModules/common/ssd; hw-common-ssd = import ./hwModules/common/ssd;
hw-framework-13-amd-7000 = import ./hwModules/framework/13/amd-7000; hw-framework-13-amd-7000 = import ./hwModules/framework/13/amd-7000;

View file

@ -1,2 +0,0 @@
{...}: {
}

View file

@ -1,17 +1,17 @@
{ {
lib, lib,
pkgs, pkgs,
self,
... ...
}: { }: {
imports = [ imports = [
../../../common/bluetooth
../../../common/cpu/amd
../../../common/gpu/amd
../../../common/laptop
../../../common/laptop/amd-gpu.nix
../../../common/ssd
../../common.nix ../../common.nix
../common.nix ../common.nix
self.nixosModules.hw-common-amd-cpu
self.nixosModules.hw-common-amd-gpu
self.nixosModules.hw-common-bluetooth
self.nixosModules.hw-common-laptop
self.nixosModules.hw-common-ssd
]; ];
boot = { boot = {

View file

@ -1,17 +1,18 @@
{ {
lib, lib,
pkgs, pkgs,
self,
... ...
}: { }: {
imports = [ imports = [
../../../common/bluetooth
../../../common/cpu/intel
../../../common/gpu/intel
../../../common/laptop
../../../common/laptop/intel-cpu.nix
../../../common/ssd
../../common.nix ../../common.nix
../common.nix ../common.nix
self.nixosModules.hw-common-bluetooth
self.nixosModules.hw-common-intel-cpu
self.nixosModules.hw-common-intel-gpu
self.nixosModules.hw-common-laptop
self.nixosModules.hw-common-laptop-intel-cpu
self.nixosModules.hw-common-ssd
]; ];
boot = { boot = {

View file

@ -1,16 +1,17 @@
{ {
lib, lib,
pkgs, pkgs,
self,
... ...
}: { }: {
imports = [ imports = [
../../../common/bluetooth
../../../common/cpu/intel
../../../common/gpu/intel
../../../common/laptop
../../../common/laptop/intel-cpu.nix
../../../common/ssd
../common.nix ../common.nix
self.nixosModules.hw-common-bluetooth
self.nixosModules.hw-common-intel-cpu
self.nixosModules.hw-common-intel-gpu
self.nixosModules.hw-common-laptop
self.nixosModules.hw-common-laptop-intel-cpu
self.nixosModules.hw-common-ssd
]; ];
boot = { boot = {

View file

@ -1,12 +1,12 @@
{...}: { {self, ...}: {
imports = [ imports = [
../../common/bluetooth
../../common/cpu/intel
../../common/gpu/intel
../../common/laptop
../../common/laptop/intel-cpu.nix
../../common/ssd
../common.nix ../common.nix
self.nixosModules.hw-common-bluetooth
self.nixosModules.hw-common-intel-cpu
self.nixosModules.hw-common-intel-gpu
self.nixosModules.hw-common-laptop
self.nixosModules.hw-common-laptop-intel-cpu
self.nixosModules.hw-common-ssd
]; ];
boot = { boot = {
@ -27,6 +27,5 @@
}; };
powerManagement.cpuFreqGovernor = "ondemand"; powerManagement.cpuFreqGovernor = "ondemand";
services.fwupd.enable = true; services.fwupd.enable = true;
} }