diff options
Diffstat (limited to 'hosts/arrakis')
| -rw-r--r-- | hosts/arrakis/default.nix | 6 | ||||
| -rw-r--r-- | hosts/arrakis/hardware-configuration.nix | 24 |
2 files changed, 15 insertions, 15 deletions
diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix index 424ec2e..fd45893 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -1,6 +1,6 @@ { config, inputs, outputs, pkgs, ... }: { boot = { - initrd.kernelModules = [ "amdgpu" "zfs" ]; + initrd.kernelModules = [ "zfs" ]; kernel.sysctl = { "net.ipv4.ip_forward" = 1; "net.ipv4.conf.all.proxy_arp" = 1; @@ -230,7 +230,7 @@ }; hostPlatform = "x86_64-linux"; overlays = [ - #inputs.nvidia-patch.overlays.default + inputs.nvidia-patch.overlays.default outputs.overlays.additions outputs.overlays.modifications outputs.overlays.master-packages @@ -240,7 +240,7 @@ }; services.openssh.settings.X11Forwarding = true; - services.xserver.videoDrivers = [ "amdgpu" ]; + services.xserver.videoDrivers = [ "nvidia" ]; sops = { age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; diff --git a/hosts/arrakis/hardware-configuration.nix b/hosts/arrakis/hardware-configuration.nix index 94367e0..c7a6652 100644 --- a/hosts/arrakis/hardware-configuration.nix +++ b/hosts/arrakis/hardware-configuration.nix @@ -17,7 +17,7 @@ }; environment.sessionVariables = { - #LIBVA_DRIVER_NAME = "nvidia"; + LIBVA_DRIVER_NAME = "nvidia"; MOZ_DISABLE_RDD_SANDBOX = "1"; }; @@ -53,19 +53,19 @@ graphics = { enable = true; - #extraPackages = with pkgs; [ nvidia-vaapi-driver ]; - #extraPackages32 = with pkgs.pkgsi686Linux; [ nvidia-vaapi-driver ]; + extraPackages = [ pkgs.nvidia-vaapi-driver ]; + extraPackages32 = [ pkgs.pkgsi686Linux.nvidia-vaapi-driver ]; }; - #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 { - # modesetting.enable = true; - # open = true; - # package = if finalPkg == betaPkg then betaPkg else finalPkg; - #}; + 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 { + modesetting.enable = true; + open = true; + package = if finalPkg == betaPkg then betaPkg else finalPkg; + }; printers = let brother = "Brother_HL-L2340D"; |