diff --git a/flake.lock b/flake.lock index 8658e30..edab3b2 100644 --- a/flake.lock +++ b/flake.lock @@ -169,11 +169,11 @@ ] }, "locked": { - "lastModified": 1744117652, - "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", + "lastModified": 1743387206, + "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", + "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146", "type": "github" }, "original": { @@ -201,11 +201,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744309437, - "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", + "lastModified": 1743576891, + "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", + "rev": "44a69ed688786e98a101f02b712c313f1ade37ab", "type": "github" }, "original": { diff --git a/services/grafana/default.nix b/services/grafana/default.nix index 0bfa2ba..537a0de 100644 --- a/services/grafana/default.nix +++ b/services/grafana/default.nix @@ -212,15 +212,6 @@ in { } ]; } - { - job_name = "jellyfin_metrics"; - metrics_path = "/metrics"; - static_configs = [ - { - targets = ["192.168.1.42:8096"]; - } - ]; - } { job_name = "crowdsec_jellyfin"; static_configs = [ diff --git a/services/jellyfin/default.nix b/services/jellyfin/default.nix index 848acae..a6f3839 100644 --- a/services/jellyfin/default.nix +++ b/services/jellyfin/default.nix @@ -10,53 +10,26 @@ in { enable = lib.mkEnableOption "Enable minimal config"; }; config = lib.mkIf cfg.enable { - systemd.services.jellyfin.environment.LIBVA_DRIVER_NAME = "iHD"; - environment = { - sessionVariables = { LIBVA_DRIVER_NAME = "iHD"; }; - systemPackages = with pkgs; [ - cifs-utils - intel-gpu-tools + environment.systemPackages = [pkgs.cifs-utils]; + # Intel Hardware Acceleration config + nixpkgs.config.packageOverrides = pkgs: { + vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; + }; + hardware.graphics = { + enable = true; + extraPackages = with pkgs; [ + intel-media-driver + intel-vaapi-driver # previously vaapiIntel + vaapiVdpau + libvdpau-va-gl + intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in) + vpl-gpu-rt # QSV on 11th gen or newer ]; }; - # Intel Hardware Acceleration config - hardware = { - intel-gpu-tools.enable = true; - graphics = { - enable = true; - extraPackages = with pkgs; [ - intel-media-driver - vaapiVdpau - libvdpau-va-gl - intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in) - vpl-gpu-rt # QSV on 11th gen or newer - ]; - extraPackages32 = with pkgs.pkgsi686Linux; [ - intel-media-driver - ]; - }; - }; - services = { - crowdsec = { - hub.collections = [ - "LePresidente/jellyfin" - ]; - localConfig = { - acquisitions = [ - { - source = "journalctl"; - journalctl_filter = [ "_SYSTEMD_UNIT=jellyfin.service" ]; - labels = { - type = "syslog"; - }; - } - ]; - }; - }; - jellyfin= { - enable = true; - user = "tbarnouin"; - openFirewall = true; - }; + services.jellyfin = { + enable = true; + user = "tbarnouin"; + openFirewall = true; }; fileSystems."/mnt/media" = { device = "192.168.1.125:/BIGDATA"; diff --git a/services/minimalConfig/default.nix b/services/minimalConfig/default.nix index d90a32e..d46bc57 100644 --- a/services/minimalConfig/default.nix +++ b/services/minimalConfig/default.nix @@ -40,7 +40,7 @@ users = { users.tbarnouin = { isNormalUser = true; - extraGroups = ["wheel" "video" "render"]; + extraGroups = ["wheel"]; shell = pkgs.zsh; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAxccGxdfOFXeEClqz3ULl94ubzaJnk4pUus+ek18G0B tbarnouin@nixos" diff --git a/services/nginx/default.nix b/services/nginx/default.nix index a233684..3ffdaaf 100644 --- a/services/nginx/default.nix +++ b/services/nginx/default.nix @@ -149,14 +149,6 @@ in { proxyPass = "http://192.168.1.42:8096"; recommendedProxySettings = true; }; - locations."/metrics" = { - proxyPass = "http://192.168.1.42:8096/metrics"; - recommendedProxySettings = true; - extraConfig = '' - allow 192.168.1.0/24; - deny all; - ''; - }; }; "requests.le43.eu" = { forceSSL = true;