summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2022-05-30 12:56:43 +0200
committermakefu <github@syntax-fehler.de>2022-05-30 12:56:43 +0200
commit12436ad8beefeb818954076432e469f34e831ad2 (patch)
tree68ba5a0643bb0e819b253087f18fae65214946e8 /makefu/1systems
parent7e89bf587256e6148b2ed46e4da0ac818a1dd012 (diff)
ma omo.r: enable vaapi
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/omo/config.nix3
-rw-r--r--makefu/1systems/omo/hw/omo.nix4
-rw-r--r--makefu/1systems/omo/hw/vaapi.nix17
3 files changed, 22 insertions, 2 deletions
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index 42f335264..ee29c03d2 100644
--- a/makefu/1systems/omo/config.nix
+++ b/makefu/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/makefu/1systems/omo/hw/omo.nix b/makefu/1systems/omo/hw/omo.nix
index ae5b778bf..eaedbb779 100644
--- a/makefu/1systems/omo/hw/omo.nix
+++ b/makefu/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/makefu/1systems/omo/hw/vaapi.nix b/makefu/1systems/omo/hw/vaapi.nix
new file mode 100644
index 000000000..8250d4110
--- /dev/null
+++ b/makefu/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 ];
+}