From 54288558f9278c75a6db34887a75ec7532d89158 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 30 May 2022 12:56:43 +0200
Subject: [PATCH] ma omo.r: enable vaapi
---
1systems/omo/config.nix | 3 ++-
1systems/omo/hw/omo.nix | 4 +++-
1systems/omo/hw/vaapi.nix | 17 +++++++++++++++++
3 files changed, 22 insertions(+), 2 deletions(-)
create mode 100644 1systems/omo/hw/vaapi.nix
diff --git a/1systems/omo/config.nix b/1systems/omo/config.nix
index 42f3352..ee29c03 100644
--- a/1systems/omo/config.nix
+++ b/1systems/omo/config.nix
@@ -28,7 +28,7 @@ in {
<stockholm/makefu/2configs/home-manager>
<stockholm/makefu/2configs/home-manager/cli.nix>
<stockholm/makefu/2configs/editor/neovim>
- <stockholm/makefu/2configs/storj/client.nix>
+ # <stockholm/makefu/2configs/storj/client.nix>
<stockholm/makefu/2configs/backup/state.nix>
@@ -98,6 +98,7 @@ in {
<stockholm/makefu/2configs/virtualisation/docker.nix>
<stockholm/makefu/2configs/bluetooth-mpd.nix>
+ <stockholm/makefu/2configs/home/jellyfin.nix>
<stockholm/makefu/2configs/home/music.nix>
<stockholm/makefu/2configs/home/photoprism.nix>
<stockholm/makefu/2configs/home/tonie.nix>
diff --git a/1systems/omo/hw/omo.nix b/1systems/omo/hw/omo.nix
index ae5b778..eaedbb7 100644
--- a/1systems/omo/hw/omo.nix
+++ b/1systems/omo/hw/omo.nix
@@ -39,7 +39,9 @@ let
in {
imports =
[ # TODO: unlock home partition via ssh
- <stockholm/makefu/2configs/fs/sda-crypto-root.nix> ];
+ ./vaapi.nix
+ <stockholm/makefu/2configs/fs/sda-crypto-root.nix> ];
+
makefu.server.primary-itf = primaryInterface;
system.activationScripts.createCryptFolders = ''
${lib.concatMapStringsSep "\n"
diff --git a/1systems/omo/hw/vaapi.nix b/1systems/omo/hw/vaapi.nix
new file mode 100644
index 0000000..8250d41
--- /dev/null
+++ b/1systems/omo/hw/vaapi.nix
@@ -0,0 +1,17 @@
+{ pkgs, ... }:
+{
+ 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
+ ];
+ };
+ hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ vaapiIntel ];
+ environment.systemPackages = [ pkgs.libva-utils ];
+}