diff --git a/flake.nix b/flake.nix index 2b21d5d..578d6f7 100644 --- a/flake.nix +++ b/flake.nix @@ -109,6 +109,7 @@ modules = [ ./ginoza/configuration.nix inputs.stylix.nixosModules.stylix + inputs.sops-nix.nixosModules.sops ]; }; }; diff --git a/ginoza/configuration.nix b/ginoza/configuration.nix index 633ee49..d960411 100644 --- a/ginoza/configuration.nix +++ b/ginoza/configuration.nix @@ -42,7 +42,8 @@ enable = true; blueman.enable = false; }; - nvidia.enable = false; + nvidiaRTX.enable = false; + nvidiaRTX.disable = false; printing.enable = true; login = { sddm.enable = false; diff --git a/nixos/system/settings/nvidia.nix b/nixos/system/settings/nvidia.nix index 1878a64..6519162 100644 --- a/nixos/system/settings/nvidia.nix +++ b/nixos/system/settings/nvidia.nix @@ -4,52 +4,83 @@ ... }: { 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 { - hardware = { - graphics.enable = true; - }; - - services.xserver.videoDrivers = ["nvidia"]; - - hardware.nvidia = { - # Modesetting is required. - modesetting.enable = true; - - # Nvidia power management. Experimental, and can cause sleep/suspend to fail. - # Enable this if you have graphical corruption issues or application crashes after waking - # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead - # of just the bare essentials. - powerManagement.enable = false; - - # Fine-grained power management. Turns off GPU when not in use. - # Experimental and only works on modern Nvidia GPUs (Turing or newer). - powerManagement.finegrained = false; - - # Use the NVidia open source kernel module (not to be confused with the - # independent third-party "nouveau" open source driver). - # Support is limited to the Turing and later architectures. Full list of - # supported GPUs is at: - # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus - # Only available from driver 515.43.04+ - # Currently alpha-quality/buggy, so false is currently the recommended setting. - open = false; - - # Enable the Nvidia settings menu, - # accessible via `nvidia-settings`. - nvidiaSettings = true; - prime.amdgpuBusId = "pci@000:04:0"; - prime.nvidiaBusId = "pci@000:01:0"; - - prime.offload = { - enable = true; - enableOffloadCmd = true; + config = lib.mkMerge [ + (lib.mkIf config.sys.nvidiaRTX.enable { + hardware = { + graphics.enable = true; }; - # Optionally, you may need to select the appropriate driver version for your specific GPU. - package = config.boot.kernelPackages.nvidiaPackages.stable; - }; - }; + services.xserver.videoDrivers = ["nvidia"]; + + hardware.nvidia = { + # Modesetting is required. + modesetting.enable = true; + + # Nvidia power management. Experimental, and can cause sleep/suspend to fail. + # Enable this if you have graphical corruption issues or application crashes after waking + # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead + # of just the bare essentials. + powerManagement.enable = false; + + # Fine-grained power management. Turns off GPU when not in use. + # Experimental and only works on modern Nvidia GPUs (Turing or newer). + powerManagement.finegrained = false; + + # Use the NVidia open source kernel module (not to be confused with the + # independent third-party "nouveau" open source driver). + # Support is limited to the Turing and later architectures. Full list of + # supported GPUs is at: + # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus + # Only available from driver 515.43.04+ + # Currently alpha-quality/buggy, so false is currently the recommended setting. + open = false; + + # Enable the Nvidia settings menu, + # accessible via `nvidia-settings`. + nvidiaSettings = true; + prime.amdgpuBusId = "pci@000:04:0"; + prime.nvidiaBusId = "pci@000:01:0"; + + prime.offload = { + enable = true; + enableOffloadCmd = true; + }; + + # Optionally, you may need to select the appropriate driver version for your specific GPU. + 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"]; + }) + ]; } diff --git a/nixos/system/system.nix b/nixos/system/system.nix index 9a99537..aae521b 100644 --- a/nixos/system/system.nix +++ b/nixos/system/system.nix @@ -1,4 +1,8 @@ -{lib, ...}: { +{ + lib, + config, + ... +}: { imports = [ ./settings/audio.nix ./settings/desktops.nix @@ -28,7 +32,17 @@ 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; login = { sddm.enable = lib.mkDefault true;