Merge branch 'main' of ssh://code.8bitbuddhism.com/aires/nix-configuration
This commit is contained in:
commit
e20f636bfb
|
@ -297,11 +297,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1725930920,
|
||||
"narHash": "sha256-RVhD9hnlTT2nJzPHlAqrWqCkA7T6CYrP41IoVRkciZM=",
|
||||
"lastModified": 1726062281,
|
||||
"narHash": "sha256-PyFVySdGj3enKqm8RQuo4v1KLJLmNLOq2yYOHsI6e2Q=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "44a71ff39c182edaf25a7ace5c9454e7cba2c658",
|
||||
"rev": "e65aa8301ba4f0ab8cb98f944c14aa9da07394f8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -17,6 +17,12 @@ in
|
|||
# NOTE: Uncomment to use a default kernel and skip full kernel rebuilds
|
||||
#kernelPackages = lib.mkForce pkgs.linuxPackages_latest;
|
||||
|
||||
# NOTE: Loading the camera driver results in a kernel panic on 6.10 kernels. See https://github.com/linux-surface/linux-surface/issues/1516
|
||||
blacklistedKernelModules = [
|
||||
"intel-ipu6"
|
||||
"intel-ipu6-isys"
|
||||
];
|
||||
|
||||
# Enable antenna aggregation
|
||||
extraModprobeConfig = ''
|
||||
options iwlwifi 11n_disable=8
|
||||
|
@ -101,18 +107,11 @@ in
|
|||
|
||||
hardware = {
|
||||
cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
# Enable camera driver
|
||||
# NOTE: Results in a kernel panic on 6.10 kernels. See https://github.com/linux-surface/linux-surface/issues/1516
|
||||
# ALSO: This causes a build failure on NixOS anyway. ee https://github.com/NixOS/nixpkgs/issues/303067
|
||||
ipu6 = {
|
||||
enable = true;
|
||||
platform = "ipu6ep";
|
||||
};
|
||||
};
|
||||
boot.blacklistedKernelModules = [
|
||||
"intel-ipu6"
|
||||
"intel-ipu6-isys"
|
||||
];
|
||||
|
||||
# Limit the number of cores Nix can use
|
||||
nix.settings.cores = 8;
|
||||
|
|
Loading…
Reference in a new issue