mirror of
https://github.com/buckley310/nixos-config.git
synced 2024-12-21 19:24:15 +00:00
simplify zfs.enableUnstable
This commit is contained in:
parent
d3fe095317
commit
c793320e1a
1 changed files with 2 additions and 8 deletions
|
@ -2,17 +2,11 @@
|
||||||
let
|
let
|
||||||
current-mode = "nvidia-mux";
|
current-mode = "nvidia-mux";
|
||||||
|
|
||||||
# remove after pkgs.zfs.latestCompatibleLinuxPackages is 6.x
|
|
||||||
zfs-needs-fixing = builtins.substring 0 2 pkgs.zfs.latestCompatibleLinuxPackages.kernel.version == "5.";
|
|
||||||
|
|
||||||
constants = {
|
constants = {
|
||||||
hardware.nvidia.prime.intelBusId = "PCI:0:2:0";
|
hardware.nvidia.prime.intelBusId = "PCI:0:2:0";
|
||||||
hardware.nvidia.prime.nvidiaBusId = "PCI:1:0:0";
|
hardware.nvidia.prime.nvidiaBusId = "PCI:1:0:0";
|
||||||
boot.kernelPackages =
|
boot.kernelPackages = pkgs.linuxPackages_6_0;
|
||||||
if zfs-needs-fixing
|
boot.zfs.enableUnstable = true; # TODO: remove
|
||||||
then pkgs.linuxPackages_6_0
|
|
||||||
else pkgs.zfs.latestCompatibleLinuxPackages;
|
|
||||||
boot.zfs.enableUnstable = zfs-needs-fixing;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
available-modes = {
|
available-modes = {
|
||||||
|
|
Loading…
Reference in a new issue