diff options
| -rw-r--r-- | hosts/arrakis/default.nix | 12 | ||||
| -rw-r--r-- | hosts/arrakis/hardware-configuration.nix | 27 |
2 files changed, 12 insertions, 27 deletions
diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix index 7a99863..2ab2f12 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -108,6 +108,16 @@ pkgs.wpa_supplicant ]; + hardware = { + #bluetooth.enable = true; + + graphics = { + enable = true; + extraPackages = [ pkgs.intel-compute-runtime pkgs.intel-ocl pkgs.vpl-gpu-rt ]; + #extraPackages32 = [ pkgs.pkgsi686Linux.nvidia-vaapi-driver ]; + }; + }; + imports = [ ./disks.nix ./hardware-configuration.nix @@ -226,7 +236,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 diff --git a/hosts/arrakis/hardware-configuration.nix b/hosts/arrakis/hardware-configuration.nix index 0d24c12..21bd5a1 100644 --- a/hosts/arrakis/hardware-configuration.nix +++ b/hosts/arrakis/hardware-configuration.nix @@ -5,7 +5,7 @@ { imports = - [ #(modulesPath + "/installer/scan/not-detected.nix") + [ (modulesPath + "/installer/scan/not-detected.nix") ]; boot = { @@ -16,11 +16,6 @@ zfs.extraPools = [ "data" ]; }; - environment.sessionVariables = { - LIBVA_DRIVER_NAME = "nvidia"; - MOZ_DISABLE_RDD_SANDBOX = "1"; - }; - fileSystems."/srv/caladan/downloads" = { device = "/data/home/nipsy/downloads"; fsType = "none"; @@ -65,24 +60,4 @@ "noauto" ]; }; - - hardware = { - bluetooth.enable = true; - - graphics = { - enable = true; - 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; - }; - }; } |