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 19918b7..9fda650 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -1,6 +1,6 @@ { config, inputs, outputs, pkgs, ... }: { boot = { - initrd.kernelModules = [ "zfs" ]; + initrd.kernelModules = [ "amdgpu" "zfs" ]; kernel.sysctl = { "net.ipv4.ip_forward" = 1; "net.ipv4.conf.all.proxy_arp" = 1; @@ -226,7 +226,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 @@ -236,7 +236,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/arrakis/hardware-configuration.nix b/hosts/arrakis/hardware-configuration.nix index c709789..94367e0 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 = with pkgs; [ nvidia-vaapi-driver ]; + #extraPackages32 = with 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"; |