refactor(desktop): clean up options formatting and simplify slice logic

Refactor `modules/desktop/options.nix` to improve code readability by
expanding the `optPath` list definition and simplifying the
`wisdomSimpleSlice` configuration logic.

Also apply minor style fixes to `modules/wisdom/filebrowsers/nemo.nix`
to ensure consistent spacing within list definitions.

modules/desktop/options.nix

@@ -1,8 +1,5 @@
-{ lib, ... }: {
-  # Resolve `wisdom*` HM slices for NixOS `extraModules` (`self` is not an HM specialArg).
-  # Slices are gated by `chiasson.home.*.enable`; hosts only flip toggles in `home.nix`.
-  # Lives here (not `modules/lib/`) because `hosts/desktop-home-base.nix` consumes it and
-  # fragment eval order requires the definition to sort before `hosts/`.
+{ lib, ... }:
+{
   flake.lib.wisdomCatalogExtraModules =
     self:
     let
@@ -14,22 +11,24 @@
     in
     map (name: self.homeManagerModules.${name}) names;
 
-  # Thin HM slice: an `enable` toggle that adds packages to `home.packages`, skipping
-  # any not `availableOn` this platform. `packages` is a `pkgs -> [ drv ]` function so
-  # callers only name each package once (the helper owns the platform-gating). Used by
-  # the trivial single-package wisdom slices so they stay one declarative block instead
-  # of the repeated `root/cfg` + `mkIf (root.enable && cfg.enable)` boilerplate.
   flake.lib.wisdomSimpleSlice =
     { path, default, description, packages }:
     { config, lib, pkgs, ... }:
     let
       segs = lib.splitString "." path;
-      optPath = [ "chiasson" "home" ] ++ segs ++ [ "enable" ];
+      optPath = [
+        "chiasson"
+        "home"
+      ]
+      ++ segs
+      ++ [ "enable" ];
+      root = config.chiasson.home;
+      cfg = lib.getAttrFromPath segs root;
       enabled = lib.getAttrFromPath optPath config;
     in
     {
       options = lib.setAttrByPath optPath (lib.mkEnableOption description // { inherit default; });
-      config = lib.mkIf (config.chiasson.home.enable && enabled) {
+      config = lib.mkIf (root.enable && enabled) {
         home.packages = lib.filter (lib.meta.availableOn pkgs.stdenv.hostPlatform) (packages pkgs);
       };
     };

modules/wisdom/browsers/chromium-hevc.nix

@@ -5,25 +5,43 @@
       cfg = config.chiasson.system.chromiumHevc;
     in
     {
-      options.chiasson.system.chromiumHevc.enable = lib.mkEnableOption ''
-        VA-API packages for Chromium HEVC (Intel iHD + optional NVIDIA nvidia-vaapi-driver).
-        Pair with `wisdomBrowsersChromiumHevc` on the user side.
-      '';
+      options.chiasson.system.chromiumHevc = {
+        enable = lib.mkEnableOption ''
+          VA-API packages for Chromium HEVC (Intel iHD + optional NVIDIA nvidia-vaapi-driver).
+          Pair with `wisdomBrowsersChromiumHevc` on the user side.
+        '';
+
+        gpu = lib.mkOption {
+          type = lib.types.enum [
+            "intel"
+            "nvidia"
+          ];
+          default = "intel";
+          description = ''
+            VA-API stack for the `*-hevc` browser launchers. Use **intel** for Jellyfin
+            (Chromium + nvidia-vaapi-driver is unsupported upstream and fails with
+            `failed Initialize()ing the frame pool` in Jellyfin). **nvidia** adds the
+            nvidia-vaapi-driver and keep renderD129 + VaapiOnNvidiaGPUs for experiments only.
+          '';
+        };
+      };
 
       config = lib.mkIf cfg.enable {
         hardware.graphics.enable = lib.mkDefault true;
         hardware.graphics.extraPackages = lib.mkAfter (
-          with pkgs;
-          [ nvidia-vaapi-driver ]
+          lib.optionals (cfg.gpu == "nvidia") [
+            pkgs.nvidia-vaapi-driver
+          ]
         );
       };
     };
 
   flake.homeManagerModules.wisdomBrowsersChromiumHevc =
-    { config, lib, pkgs, ... }:
+    { config, lib, pkgs, osConfig ? { }, ... }:
     let
       root = config.chiasson.home;
       cfg = config.chiasson.home.browsers.chromiumHevc;
+      gpu = lib.attrByPath [ "chiasson" "system" "chromiumHevc" "gpu" ] "intel" osConfig;
 
       browserCatalog = {
         "google-chrome" = {
@@ -53,7 +71,6 @@
         intel = {
           driver = "iHD";
           drmDevice = "/dev/dri/renderD128";
-          nvdBackend = "direct";
           enableFeatures = [
             "VaapiVideoDecodeLinuxGL"
             "VaapiVideoDecoder"
@@ -69,7 +86,6 @@
         nvidia = {
           driver = "nvidia";
           drmDevice = "/dev/dri/renderD129";
-          nvdBackend = "direct";
           enableFeatures = [
             "VaapiVideoDecoder"
             "VaapiIgnoreDriverChecks"
@@ -85,7 +101,30 @@
         };
       };
 
-      activeGpu = gpuProfiles.${cfg.vaapi.gpu};
+      activeGpu = gpuProfiles.${gpu};
+      enableFeatures = lib.concatStringsSep "," activeGpu.enableFeatures;
+      disableFeatures = lib.concatStringsSep "," activeGpu.disableFeatures;
+
+      mkDesktopItem =
+        spec:
+        pkgs.makeDesktopItem {
+          name = spec.launcher;
+          desktopName = spec.desktopName;
+          genericName = "Web Browser";
+          exec = "${spec.launcher} %U";
+          icon = spec.icon;
+          categories = [
+            "Network"
+            "WebBrowser"
+          ];
+          mimeTypes = [
+            "text/html"
+            "text/xml"
+            "application/xhtml+xml"
+            "x-scheme-handler/http"
+            "x-scheme-handler/https"
+          ];
+        };
 
       mkChromiumHevc =
         packageName:
@@ -93,26 +132,7 @@
           spec = browserCatalog.${packageName};
           browser = spec.package;
           launcherName = spec.launcher;
-          enableFeatures = lib.concatStringsSep "," activeGpu.enableFeatures;
-          disableFeatures = lib.concatStringsSep "," activeGpu.disableFeatures;
-          desktopItem = pkgs.makeDesktopItem {
-            name = launcherName;
-            desktopName = spec.desktopName;
-            genericName = "Web Browser";
-            exec = "${launcherName} %U";
-            icon = spec.icon;
-            categories = [
-              "Network"
-              "WebBrowser"
-            ];
-            mimeTypes = [
-              "text/html"
-              "text/xml"
-              "application/xhtml+xml"
-              "x-scheme-handler/http"
-              "x-scheme-handler/https"
-            ];
-          };
+          desktopItem = mkDesktopItem spec;
         in
         pkgs.runCommand launcherName
           {
@@ -126,7 +146,7 @@
             makeWrapper ${browser}/bin/${spec.binary} $out/bin/${launcherName} \
               --set LIBVA_DRIVER_NAME ${lib.escapeShellArg activeGpu.driver} \
               --set LIBVA_DRM_DEVICE ${lib.escapeShellArg activeGpu.drmDevice} \
-              --set NVD_BACKEND ${lib.escapeShellArg activeGpu.nvdBackend} \
+              --set NVD_BACKEND direct \
               --add-flags "--enable-features=${enableFeatures}" \
               --add-flags "--disable-features=${disableFeatures}" \
               ${lib.concatMapStringsSep " " (a: "--add-flags ${lib.escapeShellArg a}") cfg.extraCommandLineArgs}
@@ -136,50 +156,30 @@
           '';
 
       selectedPackages = lib.filter (
-        name:
-        let
-          spec = browserCatalog.${name};
-        in
-        lib.meta.availableOn pkgs.stdenv.hostPlatform spec.package
+        name: lib.meta.availableOn pkgs.stdenv.hostPlatform browserCatalog.${name}.package
       ) cfg.packages;
 
       wrappers = map mkChromiumHevc selectedPackages;
     in
     {
       options.chiasson.home.browsers.chromiumHevc = {
-        enable = lib.mkEnableOption ''
-          `google-chrome-hevc`: Chromium with VA-API HEVC for Jellyfin / MSE playback.
+        enable =
+          lib.mkEnableOption ''
+            `google-chrome-hevc`: Chromium with VA-API HEVC for Jellyfin / MSE playback.
 
-          Default GPU is **Intel** (`vaapi.gpu = "intel"`): Chromium + NVIDIA VA-API is
-          unsupported upstream (`nvidia-vaapi-driver` README) and fails with
-          `failed Initialize()ing the frame pool` in Jellyfin.
-
-          Requires `chiasson.system.chromiumHevc.enable` on NixOS.
-        '' // {
-          default = true;
-        };
+            GPU stack comes from `chiasson.system.chromiumHevc.gpu` (default **intel**).
+            Requires `chiasson.system.chromiumHevc.enable` on NixOS.
+          ''
+          // {
+            default = true;
+          };
 
         packages = lib.mkOption {
-          type = lib.types.listOf (
-            lib.types.enum (lib.attrNames browserCatalog)
-          );
+          type = lib.types.listOf (lib.types.enum (lib.attrNames browserCatalog));
           default = if pkgs.stdenv.hostPlatform.isAarch64 then [ "chromium" ] else [ "google-chrome" ];
           description = "Chromium-based browsers to wrap.";
         };
 
-        vaapi.gpu = lib.mkOption {
-          type = lib.types.enum [
-            "intel"
-            "nvidia"
-          ];
-          default = "intel";
-          description = ''
-            VA-API stack for `google-chrome-hevc`. Use **intel** for Jellyfin (Chromium +
-            nvidia-vaapi-driver is unsupported and hits frame-pool init errors). **nvidia**
-            keeps renderD129 + VaapiOnNvidiaGPUs for experiments only.
-          '';
-        };
-
         extraCommandLineArgs = lib.mkOption {
           type = lib.types.listOf lib.types.str;
           default = [ ];

modules/wisdom/filebrowsers/nemo.nix

@@ -13,7 +13,7 @@
       };
 
       config = lib.mkIf (root.enable && cfg.enable) {
-        home.packages = [pkgs.nemo];
+        home.packages = [ pkgs.nemo ];
 
         xdg.mimeApps = {
           enable = lib.mkDefault true;