Lots more moves, simplifiactions to options and removed code that peeved me off
This commit is contained in:
parent
2d2c569705
commit
384e510647
25 changed files with 59 additions and 76 deletions
|
@ -1,9 +1,6 @@
|
|||
{ config, pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
./nvidia
|
||||
./nouveau
|
||||
];
|
||||
imports = [ ./nvidia ];
|
||||
|
||||
hardware.graphics = {
|
||||
enable = config.system.desktop.enable;
|
||||
|
|
|
@ -1,9 +0,0 @@
|
|||
{ config, lib, ... }:
|
||||
{
|
||||
options.system.video.nouveau.enable = lib.mkEnableOption "Enable the Nouveau graphics stack";
|
||||
|
||||
config = lib.mkIf config.system.video.nouveau.enable {
|
||||
services.xserver.videoDrivers = [ "nouveau" ];
|
||||
boot.kernelParams = [ "nouveau.config=NvGspRm=1" ];
|
||||
};
|
||||
}
|
|
@ -1,19 +1,17 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
options.system.video.nvidia.enable = lib.mkEnableOption "Enable the Nvidia graphics stack";
|
||||
options.system.nvidia.enable = lib.mkEnableOption "Enable the Nvidia graphics stack";
|
||||
|
||||
config = lib.mkIf config.system.video.nvidia.enable {
|
||||
hardware = {
|
||||
nvidia = lib.mkIf config.system.video.nvidia.enable {
|
||||
modesetting.enable = true;
|
||||
nvidiaSettings = false;
|
||||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||
open = false;
|
||||
};
|
||||
graphics.extraPackages = with pkgs; [ nvidia-vaapi-driver ];
|
||||
config = lib.mkIf config.system.nvidia.enable {
|
||||
hardware.nvidia = {
|
||||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||
modesetting.enable = true;
|
||||
nvidiaSettings = false;
|
||||
open = false;
|
||||
};
|
||||
|
||||
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
|
||||
boot.kernelParams = [ "nvidia_drm.fbdev=1" ];
|
||||
|
||||
nixpkgs.allowUnfreePackages = [ "nvidia-x11" ];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue