From c793320e1a70ffad54f672d8392a4e18ccdef429 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Mon, 21 Nov 2022 23:16:41 -0500 Subject: [PATCH] simplify zfs.enableUnstable --- hosts/levi/optimus.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/hosts/levi/optimus.nix b/hosts/levi/optimus.nix index f6033a6..0fc976e 100644 --- a/hosts/levi/optimus.nix +++ b/hosts/levi/optimus.nix @@ -2,17 +2,11 @@ let 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 = { hardware.nvidia.prime.intelBusId = "PCI:0:2:0"; hardware.nvidia.prime.nvidiaBusId = "PCI:1:0:0"; - boot.kernelPackages = - if zfs-needs-fixing - then pkgs.linuxPackages_6_0 - else pkgs.zfs.latestCompatibleLinuxPackages; - boot.zfs.enableUnstable = zfs-needs-fixing; + boot.kernelPackages = pkgs.linuxPackages_6_0; + boot.zfs.enableUnstable = true; # TODO: remove }; available-modes = {