diff options
| -rw-r--r-- | hosts/poweredge/configuration.nix | 3 | ||||
| -rw-r--r-- | hosts/poweredge/nvidia.nix | 13 |
2 files changed, 10 insertions, 6 deletions
diff --git a/hosts/poweredge/configuration.nix b/hosts/poweredge/configuration.nix index c15f222..adf7515 100644 --- a/hosts/poweredge/configuration.nix +++ b/hosts/poweredge/configuration.nix @@ -14,9 +14,6 @@ #./notification-mailer.nix # TODO move some of this stuff to archetype ]; - # Allow unfree packages for nvidia/cuda - nixpkgs.config.allowUnfree = true; - # Setup bootloader boot._loader.enable = true; diff --git a/hosts/poweredge/nvidia.nix b/hosts/poweredge/nvidia.nix index 257a46c..5eecc71 100644 --- a/hosts/poweredge/nvidia.nix +++ b/hosts/poweredge/nvidia.nix @@ -1,7 +1,14 @@ -{ config, pkgs, ... }: { +{ lib, config, pkgs, ... }: { # Configure nixpkgs for nvidia/cuda - nixpkgs.config.allowUnfree = true; - nixpkgs.config.cudaSupport = true; + nixpkgs.config = { + cudaSupport = true; + allowUnfreePredicate = pkg: + pkgs._cuda.lib.allowUnfreeCudaPredicate pkg + || builtins.elem (lib.getName pkg) [ + "nvidia-x11" + "nvidia-kernel-modules" + ]; + }; # NVIDIA services.xserver.videoDrivers = [ "nvidia" ]; # xserver.videoDrivers does not imply X |