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

Khanda: blacklist problematic camera module and re-try kernel 6.10

Browse source
This commit is contained in:
Aires 2024-08-21 17:05:55 -04:00
parent 91aa49b0dc
commit 1ebb22cd3c
3 changed files with 8 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
flake.lock
View file

@ -263,22 +263,6 @@
"type": "github"
}
},
"nixos-hardware-surface": {
"locked": {
"lastModified": 1722332872,
"narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "14c333162ba53c02853add87a0000cbd7aa230c2",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "14c333162ba53c02853add87a0000cbd7aa230c2",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1717794163,
@ -378,7 +362,6 @@
"nix-flatpak": "nix-flatpak",
"nix-secrets": "nix-secrets",
"nixos-hardware": "nixos-hardware",
"nixos-hardware-surface": "nixos-hardware-surface",
"nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable"
}

5
flake.nix
View file

@ -26,8 +26,6 @@
# NixOS hardware quirks
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
# FIXME: Khanda fails to boot when using kernel 6.10+. This is a workaround.
nixos-hardware-surface.url = "github:NixOS/nixos-hardware?ref=14c333162ba53c02853add87a0000cbd7aa230c2";
# Home-manager support
home-manager = {
@ -49,7 +47,6 @@
lix-module,
nix-flatpak,
nixos-hardware,
nixos-hardware-surface,
nixpkgs,
nixpkgs-unstable,
nix-secrets,
@ -112,7 +109,7 @@
Khanda = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = defaultModules ++ [
nixos-hardware-surface.nixosModules.microsoft-surface-pro-9
nixos-hardware.nixosModules.microsoft-surface-pro-9
./hosts/Khanda
];
};

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

@ -96,12 +96,17 @@ in
hardware = {
cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
# Enable camera driver
# NOTE: Currently results in a build failure. For updates, see https://github.com/NixOS/nixpkgs/issues/303067
# 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;
enable = false;
platform = "ipu6ep";
};
};
boot.blacklistedKernelModules = [
"intel-ipu6"
"intel-ipu6-isys"
];
# Install/configure additional drivers, particularly for touch
environment.systemPackages = with pkgs; [ libwacom-surface ];