boot.nix

@@ -282,10 +282,8 @@ in {
           optionalAttrs config.aviallon.optimizations.enable (
             myLib.attrsets.mergeAttrsRecursive
               {
-                env = {
                 KCFLAGS = kCflags;
                 KRUSTFLAGS = kRustflags;
-                };
               }
               (traceValWithPrefix "aviallon.boot.kernel.addOptimizationAttributes" cfg.kernel.addOptimizationAttributes)
           )
@@ -319,7 +317,7 @@ in {
         #    moddedKernel
         #  ;
            
-      in mkOverride 2 (pkgs.linuxPackagesFor noDRMKernel);
+      in mkOverride 2 (pkgs.linuxPackagesFor moddedKernel);
 
       kernelPatches = []
         ++ optional cfg.x32abi.enable customKernelPatches.enableX32ABI

desktop/developer.nix

@@ -76,7 +76,8 @@ in {
       virt-viewer
       qtemu
 
-      adbfs-rootless
+      libsForQt5.kdevelop
+      unstable.adbfs-rootless
 
       amdctl
     ];

desktop/games.nix

@@ -19,8 +19,8 @@ in {
       ryujinx.package = mkOption {
         description = "Ryujinx Switch emulator package";
         type = myLib.types.package';
-        default = pkgs.ryubing;
+        default = pkgs.unstable.ryujinx;
-        example = literalExpression "pkgs.ryujinx";
+        example = literalExpression "pkgs.unstable.ryujinx";
       };
     };
   };

desktop/multimedia.nix

@@ -30,8 +30,7 @@ in {
       
       scribus
       yt-dlp
-      #jellyfin-media-player # https://github.com/NixOS/nixpkgs/issues/437865 https://github.com/jellyfin/jellyfin-media-player/issues/282
+      jellyfin-media-player
-      jellyfin-mpv-shim
 
       #jamesdsp # Audio post-processing
     ];

desktop/plasma/default.nix

@@ -6,6 +6,7 @@ let
 in {
 
   imports = [
+    ./plasma5.nix
     ./plasma6.nix
   ];
 

desktop/plasma/plasma5.nix

@@ -0,0 +1,29 @@
+{ config, pkgs, lib, ... }:
+with lib;
+let
+  cfg = config.aviallon.desktop;
+  generic = import ./generic.nix {
+    kdePackages = pkgs.libsForQt5;
+  };
+in {
+  config = mkIf (cfg.enable && (cfg.environment == "plasma")) {
+    # Enable the Plasma 5 Desktop Environment.
+    services.xserver.desktopManager.plasma5 = {
+      enable = true;
+      runUsingSystemd = true;
+      useQtScaling = true;
+
+      # Removed in: https://github.com/NixOS/nixpkgs/pull/172078
+      # and: https://github.com/NixOS/nixpkgs/pull/221721
+      # Once this (https://invent.kde.org/plasma/powerdevil/-/issues/19) is solved, make PR to add it back (prehaps by default?)
+      # supportDDC = true;
+    };
+
+    environment.systemPackages = generic.commonPackages ++ [
+      pkgs.kio-fuse
+    ];
+
+    # We prefer Plasma Wayland
+    services.displayManager.defaultSession = "plasmawayland";
+  };
+}

hardware/amd/rocm.nix

@@ -65,7 +65,7 @@ in {
                 "1101"
                 "1102" ];
       example = [ "900" "1031" ];
-      type = with types; nullOr (listOf str);
+      type = with types; nullOr (listOf string);
     };
   };
 

hardware/nvidia/proprietary.nix

@@ -178,7 +178,13 @@ in {
     nix.settings.substituters = [ "https://cuda-maintainers.cachix.org" ];
     nix.settings.trusted-public-keys = [ "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=" ];
 
-    nixpkgs.overlays = []
+    nixpkgs.overlays =
+      [(final: prev: {
+        jellyfin-media-player = prev.runCommand "jellyfinmediaplayer" { nativeBuildInputs = [ prev.makeBinaryWrapper ]; } ''
+          mkdir -p $out/bin
+          makeWrapper ${getBin prev.jellyfin-media-player}/bin/jellyfinmediaplayer $out/bin/jellyfinmediaplayer --inherit-argv0 --add-flags "--platform=xcb"
+        '';
+      })]
       ++ optional (cfg.proprietary.version == "unstable_beta") (final: prev: {
         cudaPackages_11 = final.unstable.cudaPackages_11;
         cudaPackages_12 = final.unstable.cudaPackages_12;