diff options
| -rw-r--r-- | flake.nix | 10 | ||||
| -rw-r--r-- | hosts/ginaz/hardware-configuration.nix | 16 |
2 files changed, 13 insertions, 13 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"; @@ -64,7 +64,7 @@ #nixpkgs-staging, #nixpkgs-wine9_22, nixpkgs, - #nvidia-patch, + nvidia-patch, self, sops-nix, ... diff --git a/hosts/ginaz/hardware-configuration.nix b/hosts/ginaz/hardware-configuration.nix index 2da0ea8..54d5ac7 100644 --- a/hosts/ginaz/hardware-configuration.nix +++ b/hosts/ginaz/hardware-configuration.nix @@ -30,16 +30,16 @@ #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 { - nvidia = { - branch = "beta"; + nvidia = let + betaPkg = config.boot.kernelPackages.nvidiaPackages.beta; + 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 { + #nvidia = { + #branch = "beta"; modesetting.enable = true; open = true; - #package = if finalPkg == betaPkg then betaPkg else finalPkg; + package = if finalPkg == betaPkg then betaPkg else finalPkg; prime = { amdgpuBusId = "PCI:4:0:0"; nvidiaBusId = "PCI:1:0:0"; |