diff options
| author | Mark Nipper <nipsy@bitgnome.net> | 2026-09-12 13:19:06 -0700 |
|---|---|---|
| committer | Mark Nipper <nipsy@bitgnome.net> | 2026-09-12 13:19:06 -0700 |
| commit | a1e3302ee2741641bd010a13a4f2eaee331aa600 (patch) | |
| tree | be337941ff91dadc2fa727962ed7e1a78397ad52 /hosts/ginaz | |
| parent | e017ea7e9cbd1fa8c10f792ecd2ac69181587780 (diff) | |
| download | nix-a1e3302ee2741641bd010a13a4f2eaee331aa600.tar nix-a1e3302ee2741641bd010a13a4f2eaee331aa600.tar.gz nix-a1e3302ee2741641bd010a13a4f2eaee331aa600.tar.bz2 nix-a1e3302ee2741641bd010a13a4f2eaee331aa600.tar.lz nix-a1e3302ee2741641bd010a13a4f2eaee331aa600.tar.xz nix-a1e3302ee2741641bd010a13a4f2eaee331aa600.tar.zst nix-a1e3302ee2741641bd010a13a4f2eaee331aa600.zip | |
Disable all nvidia drivers
Diffstat (limited to '')
| -rw-r--r-- | hosts/ginaz/default.nix | 4 | ||||
| -rw-r--r-- | hosts/ginaz/hardware-configuration.nix | 41 |
2 files changed, 24 insertions, 21 deletions
diff --git a/hosts/ginaz/default.nix b/hosts/ginaz/default.nix index 27dca17..50d9008 100644 --- a/hosts/ginaz/default.nix +++ b/hosts/ginaz/default.nix @@ -63,7 +63,7 @@ config.allowUnfree = true; hostPlatform = "x86_64-linux"; overlays = [ - inputs.nvidia-patch.overlays.default + #inputs.nvidia-patch.overlays.default outputs.overlays.additions #outputs.overlays.kerneol-packages outputs.overlays.master-packages @@ -73,7 +73,7 @@ }; services.openssh.settings.X11Forwarding = true; - services.xserver.videoDrivers = [ "nvidia" ]; + services.xserver.videoDrivers = [ "amdgpu" ]; sops = { age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; diff --git a/hosts/ginaz/hardware-configuration.nix b/hosts/ginaz/hardware-configuration.nix index 122b3d9..591fae6 100644 --- a/hosts/ginaz/hardware-configuration.nix +++ b/hosts/ginaz/hardware-configuration.nix @@ -23,26 +23,29 @@ graphics = { enable = true; - extraPackages = [ pkgs.nvidia-vaapi-driver ]; - extraPackages32 = [ pkgs.pkgsi686Linux.nvidia-vaapi-driver ]; + enable32Bit = true; + #extraPackages = [ pkgs.nvidia-vaapi-driver ]; + #extraPackages32 = [ pkgs.pkgsi686Linux.nvidia-vaapi-driver ]; + #package = pkgs.master.mesa; + #package32 = pkgs.master.driversi686Linux.mesa; }; - nvidia = let - betaPkg = config.boot.kernelPackages.nvidiaPackages.bleeding_edge; - pkgAfterFbc = if builtins.hasAttr betaPkg.version pkgs.nvidia-patch-list.fbc then pkgs.nvidia-patch.patch-fbc betaPkg else betaPkg; - finalPkg = if builtins.hasAttr betaPkg.version pkgs.nvidia-patch-list.nvenc then pkgs.nvidia-patch.patch-nvenc pkgAfterFbc else pkgAfterFbc; - in { - modesetting.enable = true; - open = true; - package = if finalPkg == betaPkg then betaPkg else finalPkg; - prime = { - amdgpuBusId = "PCI:4:0:0"; - nvidiaBusId = "PCI:1:0:0"; - offload = { - enable = true; - enableOffloadCmd = true; - }; - }; - }; + #nvidia = let + # betaPkg = config.boot.kernelPackages.nvidiaPackages.bleeding_edge; + # pkgAfterFbc = if builtins.hasAttr betaPkg.version pkgs.nvidia-patch-list.fbc then pkgs.nvidia-patch.patch-fbc betaPkg else betaPkg; + # finalPkg = if builtins.hasAttr betaPkg.version pkgs.nvidia-patch-list.nvenc then pkgs.nvidia-patch.patch-nvenc pkgAfterFbc else pkgAfterFbc; + #in { + # modesetting.enable = true; + # open = true; + # package = if finalPkg == betaPkg then betaPkg else finalPkg; + # prime = { + # amdgpuBusId = "PCI:4:0:0"; + # nvidiaBusId = "PCI:1:0:0"; + # offload = { + # enable = true; + # enableOffloadCmd = true; + # }; + # }; + #}; }; } |