aires/nix-configuration
aires/nix-configuration
1
0
Fork 0
Code Actions Activity

Merge branch 'main' of ssh://code.8bitbuddhism.com/aires/nix-configuration

Browse source
This commit is contained in:
Aires 2024-09-14 12:34:05 -04:00
parent f8acdf77cb a6f2e201d4
commit e20f636bfb
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -297,11 +297,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1725930920, "lastModified": 1726062281,
"narHash": "sha256-RVhD9hnlTT2nJzPHlAqrWqCkA7T6CYrP41IoVRkciZM=", "narHash": "sha256-PyFVySdGj3enKqm8RQuo4v1KLJLmNLOq2yYOHsI6e2Q=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "44a71ff39c182edaf25a7ace5c9454e7cba2c658", "rev": "e65aa8301ba4f0ab8cb98f944c14aa9da07394f8",
"type": "github" "type": "github"
}, },
"original": { "original": {

13
hosts/Khanda/hardware-configuration.nix
View file

@ -17,6 +17,12 @@ in
# NOTE: Uncomment to use a default kernel and skip full kernel rebuilds # NOTE: Uncomment to use a default kernel and skip full kernel rebuilds
#kernelPackages = lib.mkForce pkgs.linuxPackages_latest; #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 # Enable antenna aggregation
extraModprobeConfig = '' extraModprobeConfig = ''
options iwlwifi 11n_disable=8 options iwlwifi 11n_disable=8
@ -101,18 +107,11 @@ in
hardware = { hardware = {
cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; 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 = { ipu6 = {
enable = true; enable = true;
platform = "ipu6ep"; platform = "ipu6ep";
}; };
}; };
boot.blacklistedKernelModules = [
"intel-ipu6"
"intel-ipu6-isys"
];
# Limit the number of cores Nix can use # Limit the number of cores Nix can use
nix.settings.cores = 8; nix.settings.cores = 8;