mirror of
https://github.com/CHN-beta/nixos.git
synced 2026-01-11 16:49:22 +08:00
fix kernel 6.18 build
This commit is contained in:
@@ -13,7 +13,8 @@ inputs:
|
||||
{ joystick = genericOption; printer = genericOption; sound = genericOption; bolt = genericOption; };
|
||||
config = let inherit (inputs.config.nixos) hardware; in inputs.lib.mkMerge
|
||||
[
|
||||
(inputs.lib.mkIf (hardware.joystick != null) { hardware = { xone.enable = true; xpadneo.enable = true; }; })
|
||||
# TODO: enable after fix
|
||||
# (inputs.lib.mkIf (hardware.joystick != null) { hardware = { xone.enable = true; xpadneo.enable = true; }; })
|
||||
(
|
||||
inputs.lib.mkIf (hardware.printer != null)
|
||||
{
|
||||
|
||||
@@ -79,6 +79,7 @@ inputs:
|
||||
[{
|
||||
config =
|
||||
{
|
||||
# TODO: use nixos module, enable kernel module
|
||||
programs.obs-studio =
|
||||
{
|
||||
enable = true;
|
||||
|
||||
@@ -45,11 +45,8 @@ inputs:
|
||||
]
|
||||
# touchscreen for one
|
||||
++ (inputs.lib.optionals (inputs.config.nixos.model.arch == "x86_64") [ "pinctrl-tigerlake" ]);
|
||||
extraModulePackages = with inputs.config.boot.kernelPackages;
|
||||
[
|
||||
v4l2loopback
|
||||
(if inputs.pkgs.stdenv.hostPlatform.linuxArch == "x86_64" then zenpower else inputs.pkgs.emptyDirectory)
|
||||
];
|
||||
extraModulePackages = inputs.lib.optionals (inputs.pkgs.stdenv.hostPlatform.linuxArch == "x86_64")
|
||||
[ inputs.config.boot.kernelPackages.zenpower ];
|
||||
# force i2c-hid-acpi to load after pinctrl-tigerlake
|
||||
extraModprobeConfig = "softdep i2c-hid-acpi pre: pinctrl-tigerlake";
|
||||
kernelParams = inputs.lib.mkMerge
|
||||
|
||||
Reference in New Issue
Block a user