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

Merge branch 'production' into archive

Browse Source
This commit is contained in:
陈浩南
2025-12-06 19:47:15 +08:00
parent 0a65102ac5 354543db24
commit 93cd518084
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/system/gui.nix
View File

@@ -81,6 +81,7 @@ inputs:
"Mod+Right".action.focus-column-right = {};
"Mod+MouseMiddle".action.close-window = {};
"Mod+L".action.spawn = [ "dms" "ipc" "lock" "lock" ];
"Mod+W".action.move-workspace-to-monitor-next = {};
};
outputs =
{

2
modules/system/kernel.nix
View File

@@ -47,8 +47,6 @@ inputs:
++ (inputs.lib.optionals (inputs.config.nixos.model.arch == "x86_64") [ "pinctrl-tigerlake" ]);
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
[
[ "delayacct" ]