[all] Hardware acceleration

4 files changed, 33 insertions, 9 deletions

diff --git a/configuration.nix b/configuration.nix
index bb32207..ba88560 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -86,20 +86,13 @@
   #
 
   # https://nixos.wiki/wiki/Accelerated_Video_Playback
-  nixpkgs.config.packageOverrides = pkgs: {
-    vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
-  };
   hardware.opengl = {
-    enable = true;
     extraPackages = with pkgs; [
-      intel-media-driver # LIBVA_DRIVER_NAME=iHD
-      vaapiIntel         # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
       vaapiVdpau
       libvdpau-va-gl
     ];
   };
 
-
   #
   # Sound
   #
diff --git a/machines/juno/configuration.nix b/machines/juno/configuration.nix
index 9e75d45..113be25 100644
--- a/machines/juno/configuration.nix
+++ b/machines/juno/configuration.nix
@@ -12,4 +12,16 @@
       ["level auto" 53 32767]
     ];
   };
+
+  # https://nixos.wiki/wiki/Accelerated_Video_Playback
+  nixpkgs.config.packageOverrides = pkgs: {
+    vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+  };
+  hardware.opengl = {
+    enable = true;
+    extraPackages = with pkgs; [
+      intel-media-driver # LIBVA_DRIVER_NAME=iHD
+      vaapiIntel         # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
+    ];
+  };
 }
diff --git a/machines/minerva/configuration.nix b/machines/minerva/configuration.nix
index 3efaed5..7a87dcb 100644
--- a/machines/minerva/configuration.nix
+++ b/machines/minerva/configuration.nix
@@ -3,4 +3,16 @@
     tigervnc ubridge x11vnc xvfb-run
     mlocate
   ];
+
+  # https://nixos.wiki/wiki/Accelerated_Video_Playback
+  nixpkgs.config.packageOverrides = pkgs: {
+    vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+  };
+  hardware.opengl = {
+    enable = true;
+    extraPackages = with pkgs; [
+      intel-media-driver # LIBVA_DRIVER_NAME=iHD
+      vaapiIntel         # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
+    ];
+  };
 }
diff --git a/machines/vesta/configuration.nix b/machines/vesta/configuration.nix
index a50c6c5..fd671d5 100644
--- a/machines/vesta/configuration.nix
+++ b/machines/vesta/configuration.nix
@@ -9,7 +9,10 @@
       fsType = "ext4";
     };
 
-  environment.systemPackages = with pkgs; [ alsa-plugins ];
+    environment.systemPackages = with pkgs; [
+      alsa-plugins
+      radeontop
+    ];
 
   # https://github.com/NixOS/nixpkgs/issues/6860
   environment.sessionVariables = {
@@ -18,7 +21,6 @@
 
   # GPU
   boot.initrd.kernelModules = [ "amdgpu" ];
-  services.xserver.enable = true;
   services.xserver.videoDrivers = [ "amdgpu" ];
   # for Southern Islands (SI ie. GCN 1) cards
   boot.kernelParams = [ "radeon.si_support=0" "amdgpu.si_support=1" ];
@@ -26,11 +28,16 @@
     "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.hip}"
   ];
   hardware.opengl = {
+    # Mesa
     enable = true;
+
+    # OpenCL
     extraPackages = with pkgs; [
       rocm-opencl-icd
       rocm-opencl-runtime
     ];
+
+    # Vulkan
     driSupport = true;
     # For 32 bit applications
     driSupport32Bit = true;