3 files changed, 26 insertions, 30 deletions
diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix
index 5c19fe3..eae67ee 100644
--- a/hosts/arrakis/default.nix
+++ b/hosts/arrakis/default.nix
@@ -93,9 +93,12 @@
     '';
   };
 
+  environment.sessionVariables = { LIBVA_DRIVER_NAME = "iHD"; };
+
   environment.systemPackages = [
     #pkgs.bitcoind
     pkgs.igir
+    pkgs.intel-gpu-tools
     pkgs.lidarr
     pkgs.mailutils
     pkgs.megacmd
@@ -108,6 +111,20 @@
     pkgs.wpa_supplicant
   ];
 
+  hardware = {
+    #bluetooth.enable = true;
+
+    graphics = {
+      enable = true;
+      extraPackages = [
+        pkgs.intel-compute-runtime
+        pkgs.intel-media-driver
+        pkgs.intel-ocl pkgs.vpl-gpu-rt
+      ];
+      #extraPackages32 = [ pkgs.pkgsi686Linux.nvidia-vaapi-driver ];
+    };
+  };
+
   imports = [
     ./disks.nix
     ./hardware-configuration.nix
@@ -123,6 +140,7 @@
     #../common/optional/pipewire.nix
     #../common/optional/sdr.nix
     ../common/optional/services/chrony.nix
+    ../common/optional/services/fwupd.nix
     ../common/optional/services/openssh.nix
     #../common/optional/services/xorg.nix
     #../common/optional/sound.nix
@@ -226,7 +244,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 +258,10 @@
     defaultSopsFile = ../secrets/arrakis.yaml;
 
     secrets = {
-      "htpasswd" = {};
+      "htpasswd" = {
+        owner = config.users.users.nginx.name;
+        group = config.users.users.nginx.group;
+      };
       "nftables/ssh" = {};
       "nix-access-token-github" = {};
       "ssh_config".path = "/root/.ssh/config";
@@ -268,6 +289,7 @@
   system.stateVersion = "23.11";
 
   systemd.services = {
+    jellyfin.environment.LIBVA_DRIVER_NAME = "iHD";
 
     "lidarr" = {
       after = [ "network.target" ];
@@ -425,7 +447,6 @@
       };
       wantedBy = [ "multi-user.target" ];
     };
-
   };
 
   systemd.paths."nftables-extra" = {
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;
-    };
-  };
 }
diff --git a/hosts/arrakis/services.nix b/hosts/arrakis/services.nix
index 51f9e59..697c25b 100644
--- a/hosts/arrakis/services.nix
+++ b/hosts/arrakis/services.nix
@@ -365,7 +365,7 @@
       pkgs.vial
     ];
 
-    xserver.videoDrivers = [ "nvidia" ];
+    #xserver.videoDrivers = [ "nvidia" ];
 
   };