chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2026-01-12 01:55:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix kernel 6.18 build

Browse Source
This commit is contained in:
陈浩南
2025-12-05 09:36:28 +08:00
parent bf29b9d756
commit c12842ea3c
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/hardware/default.nix
View File

@@ -13,7 +13,8 @@ inputs:
{ joystick = genericOption; printer = genericOption; sound = genericOption; bolt = genericOption; }; { joystick = genericOption; printer = genericOption; sound = genericOption; bolt = genericOption; };
config = let inherit (inputs.config.nixos) hardware; in inputs.lib.mkMerge 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) inputs.lib.mkIf (hardware.printer != null)
{ {

1
modules/packages/desktop.nix
View File

@@ -79,6 +79,7 @@ inputs:
[{ [{
config = config =
{ {
# TODO: use nixos module, enable kernel module
programs.obs-studio = programs.obs-studio =
{ {
enable = true; enable = true;

7
modules/system/kernel.nix
View File

@@ -45,11 +45,8 @@ inputs:
] ]
# touchscreen for one # touchscreen for one
++ (inputs.lib.optionals (inputs.config.nixos.model.arch == "x86_64") [ "pinctrl-tigerlake" ]); ++ (inputs.lib.optionals (inputs.config.nixos.model.arch == "x86_64") [ "pinctrl-tigerlake" ]);
extraModulePackages = with inputs.config.boot.kernelPackages; extraModulePackages = inputs.lib.optionals (inputs.pkgs.stdenv.hostPlatform.linuxArch == "x86_64")
[ [ inputs.config.boot.kernelPackages.zenpower ];
v4l2loopback
(if inputs.pkgs.stdenv.hostPlatform.linuxArch == "x86_64" then zenpower else inputs.pkgs.emptyDirectory)
];
# force i2c-hid-acpi to load after pinctrl-tigerlake # force i2c-hid-acpi to load after pinctrl-tigerlake
extraModprobeConfig = "softdep i2c-hid-acpi pre: pinctrl-tigerlake"; extraModprobeConfig = "softdep i2c-hid-acpi pre: pinctrl-tigerlake";
kernelParams = inputs.lib.mkMerge kernelParams = inputs.lib.mkMerge