From 7762150e90b7ecf0a2a0bfc07ccf1f7cb934dd10 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Thu, 18 Dec 2025 11:56:39 -0600 Subject: [PATCH] update h001 --- flake.nix | 3 + hosts/h001/flake.lock | 172 +++++++++++------------ hosts/h001/mods/default.nix | 1 + hosts/h001/mods/hardware-transcoding.nix | 50 +++++++ 4 files changed, 140 insertions(+), 86 deletions(-) create mode 100644 hosts/h001/mods/hardware-transcoding.nix diff --git a/flake.nix b/flake.nix index e824caff..39c8f991 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,9 @@ (pkgs.writeShellScriptBin "deploy_o001" '' nixos-rebuild --flake $(git rev-parse --show-toplevel)'/hosts/oracle/o001' --target-host o001 --use-substitutes --no-reexec switch '') + (pkgs.writeShellScriptBin "deploy_h001" '' + nixos-rebuild --flake $(git rev-parse --show-toplevel)'/hosts/h001' --target-host h001 --use-substitutes --no-reexec switch + '') (pkgs.writeShellScriptBin "deploy_i001" '' NIX_SSHOPTS="-i /run/agenix/nix2nix" nixos-rebuild --flake $(git rev-parse --show-toplevel)'/hosts/i001' --target-host root@10.12.14.119 --use-substitutes --no-reexec switch '') diff --git a/hosts/h001/flake.lock b/hosts/h001/flake.lock index 3408ac39..ed32e5df 100644 --- a/hosts/h001/flake.lock +++ b/hosts/h001/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "lastModified": 1761656077, + "narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=", "owner": "ryantm", "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5", "type": "github" }, "original": { @@ -31,11 +31,11 @@ }, "locked": { "dir": "flakes/beszel", - "lastModified": 1764605979, - "narHash": "sha256-r0wK530ZaBl8N/XibZBJ1W5XQJJELwKiOgIeQdUvUho=", + "lastModified": 1766078770, + "narHash": "sha256-zzH5ejNAs/B42GGLVaa+SLt11PU0RPVKAdvTZUJolRU=", "ref": "refs/heads/master", - "rev": "cb0bb69c22f78ecd6336d10330c0d3de64ceed1a", - "revCount": 828, + "rev": "49f82a343492cd5c47797f4f1b843bb5453a7c7b", + "revCount": 953, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -47,11 +47,11 @@ }, "beszel-nixpkgs": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1765472234, + "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", "type": "github" }, "original": { @@ -63,11 +63,11 @@ }, "beszel-nixpkgs_2": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { @@ -80,11 +80,11 @@ "common": { "locked": { "dir": "flakes/common", - "lastModified": 1765212935, - "narHash": "sha256-hz9fjZN7A5Qyvu4Dkha1f3K0KhJQxLQnJTuDcB4/S14=", + "lastModified": 1766078770, + "narHash": "sha256-zzH5ejNAs/B42GGLVaa+SLt11PU0RPVKAdvTZUJolRU=", "ref": "refs/heads/master", - "rev": "b7330b4c09e7f62e83ea30959dab5c2230041847", - "revCount": 861, + "rev": "49f82a343492cd5c47797f4f1b843bb5453a7c7b", + "revCount": 953, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -96,11 +96,11 @@ }, "crane": { "locked": { - "lastModified": 1741481578, - "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=", + "lastModified": 1760924934, + "narHash": "sha256-tuuqY5aU7cUkR71sO2TraVKK2boYrdW3gCSXUkF4i44=", "owner": "ipetkov", "repo": "crane", - "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5", + "rev": "c6b4d5308293d0d04fcfeee92705017537cad02f", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "lastModified": 1744478979, + "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "rev": "43975d782b418ebf4969e9ccba82466728c2851b", "type": "github" }, "original": { @@ -153,11 +153,11 @@ }, "forgejo-nixpkgs": { "locked": { - "lastModified": 1764667669, - "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "418468ac9527e799809c900eda37cbff999199b6", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { @@ -172,11 +172,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1764866045, - "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=", + "lastModified": 1765979862, + "narHash": "sha256-/r9/1KamvbHJx6I40H4HsSXnEcBAkj46ZwibhBx9kg0=", "owner": "rycee", "repo": "home-manager", - "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab", + "rev": "d3135ab747fd9dac250ffb90b4a7e80634eacbe9", "type": "github" }, "original": { @@ -196,11 +196,11 @@ ] }, "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "lastModified": 1745494811, + "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", "type": "github" }, "original": { @@ -211,11 +211,11 @@ }, "litellm-nixpkgs": { "locked": { - "lastModified": 1765472234, - "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { @@ -227,11 +227,11 @@ }, "n8n-nixpkgs": { "locked": { - "lastModified": 1764667669, - "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "418468ac9527e799809c900eda37cbff999199b6", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { @@ -248,11 +248,11 @@ "website-builder": "website-builder" }, "locked": { - "lastModified": 1764066022, - "narHash": "sha256-YY9UdoNN/Iu9HTYsUWuZQiuRyQYOtcvnsT5X/+LuV1M=", + "lastModified": 1765731404, + "narHash": "sha256-eIEh60iK0L4X7UHj7dOZWZEkmWRA1H7ovjVJsfrPavQ=", "owner": "rasmus-kirk", "repo": "nixarr", - "rev": "3ea7ad8a1ca9d67df206cda19775ce711a55add4", + "rev": "204da9209ad4e921c3562a6bca5ac8ad5b6ed9bc", "type": "github" }, "original": { @@ -263,11 +263,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764522689, - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", + "lastModified": 1765762245, + "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", + "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d", "type": "github" }, "original": { @@ -279,27 +279,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1761016216, - "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", + "lastModified": 1765608474, + "narHash": "sha256-9Wx53UK0z8Di5iesJID0tS1dRKwGxI4i7tsSanOHhF0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", + "rev": "28bb483c11a1214a73f9fd2d9928a6e2ea86ec71", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1764983851, - "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=", + "lastModified": 1765838191, + "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454", + "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6", "type": "github" }, "original": { @@ -326,11 +326,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1741379970, - "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", + "lastModified": 1761672384, + "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", + "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", "type": "github" }, "original": { @@ -1206,11 +1206,11 @@ }, "oauth2-proxy-nixpkgs": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { @@ -1222,11 +1222,11 @@ }, "open-webui-nixpkgs": { "locked": { - "lastModified": 1765472234, - "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { @@ -1238,11 +1238,11 @@ }, "pinchflat-nixpkgs": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { @@ -1261,11 +1261,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1744897914, - "narHash": "sha256-GIVU92o2TZBnKQXTb76zpQbWR4zjU2rFqWKNIIpXnqA=", + "lastModified": 1761832913, + "narHash": "sha256-VCNVjjuRvrKPiYYwqhE3BAKIaReiKXGpxGp27lZ0MFM=", "owner": "yaxitech", "repo": "ragenix", - "rev": "40f2e17ecaeab4d78ec323e96a04548c0aaa5223", + "rev": "83bccfdea758241999f32869fb6b36f7ac72f1ac", "type": "github" }, "original": { @@ -1354,11 +1354,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1764777428, - "narHash": "sha256-wFfPnXo1P+NwSK+Y7xYVwt0mbYhe9uBrf80T5KpBV5Q=", + "lastModified": 1765641080, + "narHash": "sha256-AyPi7rZVfjTjQrhPHP+ugpVY8tcUzF3Lw1RjACuxAms=", "ref": "refs/heads/master", - "rev": "ee642c429fced7d51c5f9c9694034f6222a1186f", - "revCount": 324, + "rev": "224ad4e3ecd9421c7469c4f06ff5faf7f6e8bedb", + "revCount": 325, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, @@ -1397,11 +1397,11 @@ ] }, "locked": { - "lastModified": 1741400194, - "narHash": "sha256-tEpgT+q5KlGjHSm8MnINgTPErEl8YDzX3Eps8PVc09g=", + "lastModified": 1761791894, + "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "16b6045a232fea0e9e4c69e55a6e269607dd8e3f", + "rev": "59c45eb69d9222a4362673141e00ff77842cd219", "type": "github" }, "original": { @@ -1416,11 +1416,11 @@ }, "locked": { "dir": "flakes/secrets", - "lastModified": 1764605979, - "narHash": "sha256-r0wK530ZaBl8N/XibZBJ1W5XQJJELwKiOgIeQdUvUho=", + "lastModified": 1766078770, + "narHash": "sha256-zzH5ejNAs/B42GGLVaa+SLt11PU0RPVKAdvTZUJolRU=", "ref": "refs/heads/master", - "rev": "cb0bb69c22f78ecd6336d10330c0d3de64ceed1a", - "revCount": 828, + "rev": "49f82a343492cd5c47797f4f1b843bb5453a7c7b", + "revCount": 953, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -1462,11 +1462,11 @@ }, "trilium-nixpkgs": { "locked": { - "lastModified": 1764667669, - "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "418468ac9527e799809c900eda37cbff999199b6", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { @@ -1478,11 +1478,11 @@ }, "vpnconfinement": { "locked": { - "lastModified": 1759956062, - "narHash": "sha256-NUZu0Rb0fwUjfdp51zMm0xM3lcK8Kw4c97LLog7+JjA=", + "lastModified": 1765634578, + "narHash": "sha256-Fujb9sn1cj+u/bzfo2RbQkcAvJ7Ch1pimJzFie4ptb4=", "owner": "Maroka-chan", "repo": "VPN-Confinement", - "rev": "fabe7247b720b5eb4c3c053e24a2b3b70e64c52b", + "rev": "f2989e1e3cb06c7185939e9ddc368f88b998616a", "type": "github" }, "original": { @@ -1514,11 +1514,11 @@ }, "zitadel-nixpkgs": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { diff --git a/hosts/h001/mods/default.nix b/hosts/h001/mods/default.nix index 9946f3bb..ee6f6a9f 100644 --- a/hosts/h001/mods/default.nix +++ b/hosts/h001/mods/default.nix @@ -5,6 +5,7 @@ imports = [ ./litellm.nix ./nixarr.nix + ./hardware-transcoding.nix ./monitoring_hub.nix ./pinchflat.nix ./openwebui.nix diff --git a/hosts/h001/mods/hardware-transcoding.nix b/hosts/h001/mods/hardware-transcoding.nix new file mode 100644 index 00000000..d31e1d32 --- /dev/null +++ b/hosts/h001/mods/hardware-transcoding.nix @@ -0,0 +1,50 @@ +{ pkgs, ... }: +{ + ############################ + # Intel iGPU / VAAPI / QSV # + ############################ + + # Modern graphics stack + hardware.graphics = { + enable = true; + extraPackages = with pkgs; [ + # VAAPI driver for Broadwell and newer (your 11th gen) + intel-media-driver + + # OpenCL / compute; 11th gen typically works with the non-legacy runtime + intel-ocl + intel-compute-runtime + + # VPL runtime – needed for modern QSV on newer Intel (11th gen+) + vpl-gpu-rt + + # VAAPI ⇔ VDPAU bridge (optional but harmless) + libva-vdpau-driver + ]; + }; + + # Make sure the right VAAPI driver is used (iHD is correct for 11th gen) + environment.sessionVariables = { + LIBVA_DRIVER_NAME = "iHD"; + }; + + # Optional but can help when services (like jellyfin) run in their own units + systemd.services.jellyfin.environment.LIBVA_DRIVER_NAME = "iHD"; + + ######################## + # Firmware for the iGPU + ######################## + + # Ensures i915 GuC/HuC firmware is available (avoids “GuC firmware … ENOENT” errors) + hardware.enableAllFirmware = true; + + ######################## + # (Optional) debugging + ######################## + + environment.systemPackages = with pkgs; [ + libva-utils # vainfo + intel-gpu-tools # intel_gpu_top + clinfo # OpenCL info + ]; +}