nvidia graphics and ginoza config update

This commit is contained in:
foglar 2024-12-26 17:32:24 +01:00
parent a56fc0c35f
commit 77ec2e5d43
4 changed files with 94 additions and 47 deletions

View File

@ -109,6 +109,7 @@
modules = [ modules = [
./ginoza/configuration.nix ./ginoza/configuration.nix
inputs.stylix.nixosModules.stylix inputs.stylix.nixosModules.stylix
inputs.sops-nix.nixosModules.sops
]; ];
}; };
}; };

View File

@ -42,7 +42,8 @@
enable = true; enable = true;
blueman.enable = false; blueman.enable = false;
}; };
nvidia.enable = false; nvidiaRTX.enable = false;
nvidiaRTX.disable = false;
printing.enable = true; printing.enable = true;
login = { login = {
sddm.enable = false; sddm.enable = false;

View File

@ -4,10 +4,22 @@
... ...
}: { }: {
options = { options = {
sys.nvidia.enable = lib.mkEnableOption "Enable Nvidia graphics support"; sys.nvidia = lib.mkOption {
type = lib.types.attrs;
default = {
enable = false;
disable = false;
};
description = ''
NVIDIA graphics support.
'';
};
sys.nvidiaRTX.enable = lib.mkEnableOption "Enable NVIDIA Prime graphics support";
sys.nvidiaRTX.disable = lib.mkEnableOption "Disable NVIDIA graphics completely";
}; };
config = lib.mkIf config.sys.nvidia.enable { config = lib.mkMerge [
(lib.mkIf config.sys.nvidiaRTX.enable {
hardware = { hardware = {
graphics.enable = true; graphics.enable = true;
}; };
@ -51,5 +63,24 @@
# Optionally, you may need to select the appropriate driver version for your specific GPU. # Optionally, you may need to select the appropriate driver version for your specific GPU.
package = config.boot.kernelPackages.nvidiaPackages.stable; package = config.boot.kernelPackages.nvidiaPackages.stable;
}; };
}; })
(lib.mkIf config.sys.nvidiaRTX.disable {
boot.extraModprobeConfig = ''
blacklist nouveau
options nouveau modeset=0
'';
services.udev.extraRules = ''
# Remove NVIDIA USB xHCI Host Controller devices, if present
ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{power/control}="auto", ATTR{remove}="1"
# Remove NVIDIA USB Type-C UCSI devices, if present
ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c8000", ATTR{power/control}="auto", ATTR{remove}="1"
# Remove NVIDIA Audio devices, if present
ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{power/control}="auto", ATTR{remove}="1"
# Remove NVIDIA VGA/3D controller devices
ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x03[0-9]*", ATTR{power/control}="auto", ATTR{remove}="1"
'';
boot.blacklistedKernelModules = ["nouveau" "nvidia" "nvidia_drm" "nvidia_modeset"];
})
];
} }

View File

@ -1,4 +1,8 @@
{lib, ...}: { {
lib,
config,
...
}: {
imports = [ imports = [
./settings/audio.nix ./settings/audio.nix
./settings/desktops.nix ./settings/desktops.nix
@ -28,7 +32,17 @@
enable = lib.mkDefault true; enable = lib.mkDefault true;
blueman.enable = lib.mkDefault true; blueman.enable = lib.mkDefault true;
}; };
nvidia.enable = lib.mkDefault true; nvidia.enable = lib.mkDefault false;
nvidiaRTX.enable =
if config.sys.nvidia.enable == true
then lib.mkDefault true
else false;
nvidiaRTX.disable =
if config.sys.nvidia.enable == true
then lib.mkDefault false
else true;
printing.enable = lib.mkDefault true; printing.enable = lib.mkDefault true;
login = { login = {
sddm.enable = lib.mkDefault true; sddm.enable = lib.mkDefault true;