diff options
| author | lassulus <lassulus@lassul.us> | 2022-06-07 15:46:12 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2022-06-07 15:46:12 +0200 |
| commit | b3786c3a74fce6a742649c37ab2ad1255f5864bf (patch) | |
| tree | a5453da91d868781b2339722a4e7bf588993ac09 /makefu/1systems/omo/hw | |
| parent | e6f67aa910f78ecf75f3a47a0794497148c60c2b (diff) | |
| parent | 53855cd2d0dadb159215c5ed12e6d0be02dca98b (diff) | |
Merge remote-tracking branch 'gum/22.05'
Diffstat (limited to 'makefu/1systems/omo/hw')
| -rw-r--r-- | makefu/1systems/omo/hw/omo.nix | 4 | ||||
| -rw-r--r-- | makefu/1systems/omo/hw/vaapi.nix | 17 |
2 files changed, 20 insertions, 1 deletions
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 ]; +} |