flake.lock

@@ -169,11 +169,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744117652,
+        "lastModified": 1743387206,
-        "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=",
+        "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,
+        "lastModified": 1743576891,
-        "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=",
+        "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7",
+        "rev": "44a69ed688786e98a101f02b712c313f1ade37ab",
         "type": "github"
       },
       "original": {

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 = [

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.systemPackages = [pkgs.cifs-utils];
-    environment = {
+    # Intel Hardware Acceleration config
-      sessionVariables = { LIBVA_DRIVER_NAME = "iHD"; };
+    nixpkgs.config.packageOverrides = pkgs: {
-      systemPackages = with pkgs; [
+      vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
-        cifs-utils
+    };
-        intel-gpu-tools
+    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
+    services.jellyfin = {
-    hardware = {
+      enable = true;
-      intel-gpu-tools.enable = true;
+      user = "tbarnouin";
-      graphics = {
+      openFirewall = true;
-        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;
-      };
     };
     fileSystems."/mnt/media" = {
       device = "192.168.1.125:/BIGDATA";

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"

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;