diff options
| -rw-r--r-- | flake.nix | 8 | ||||
| -rw-r--r-- | hosts/ginaz/default.nix | 4 | ||||
| -rw-r--r-- | hosts/ginaz/hardware-configuration.nix | 41 |
3 files changed, 28 insertions, 25 deletions
@@ -39,10 +39,10 @@ #nixpkgs-pr545346.url = "github:JamieMagee/nixpkgs/python3Packages.ct3"; #nixpkgs-wine9_22.url = "github:nixos/nixpkgs/dea5930f0ed8c29d3758d5ade9898b4e99d80b74"; - nvidia-patch = { - url = "github:icewind1991/nvidia-patch-nixos"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + #nvidia-patch = { + # url = "github:icewind1991/nvidia-patch-nixos"; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; sops-nix = { url = "github:Mic92/sops-nix"; 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; + # }; + # }; + #}; }; } |