qt: merge PR 5156

modules/misc/qt.nix

@@ -6,6 +6,7 @@ let
   # Map platform names to their packages.
   platformPackages = with pkgs; {
     gnome = [ qgnomeplatform qgnomeplatform-qt6 ];
+    adwaita = [ qadwaitadecorations qadwaitadecorations-qt6 ];
     gtk = [ libsForQt5.qtstyleplugins qt6Packages.qt6gtk2 ];
     kde = [ libsForQt5.plasma-integration libsForQt5.systemsettings ];
     lxqt = [ lxqt.lxqt-qtplugin lxqt.lxqt-config ];
@@ -55,14 +56,17 @@ in {
     qt = {
       enable = lib.mkEnableOption "Qt 5 and 6 configuration";
 
-      platformTheme = lib.mkOption {
+      platformTheme = let
-        type = with lib.types;
+        newOption = {
-          nullOr (enum [ "gtk" "gtk3" "gnome" "lxqt" "qtct" "kde" ]);
+          name = lib.mkOption {
+            type = with lib.types; nullOr str;
             default = null;
-        example = "gnome";
+            example = "adwaita";
             relatedPackages = [
               "qgnomeplatform"
               "qgnomeplatform-qt6"
+              "qadwaitadecorations"
+              "qadwaitadecorations-qt6"
               [ "libsForQt5" "plasma-integration" ]
               [ "libsForQt5" "qt5ct" ]
               [ "libsForQt5" "qtstyleplugins" ]
@@ -75,7 +79,7 @@ in {
             description = ''
               Platform theme to use for Qt applications.
 
-          The options are
+              Some examples are
 
               `gtk`
               : Use GTK theme with
@@ -85,9 +89,14 @@ in {
               : Use [GTK3 integration](https://github.com/qt/qtbase/tree/dev/src/plugins/platformthemes/gtk3)
                 for file picker dialogs, font and theme configuration
 
-          `gnome`
+              `adwaita`
+              : Use Adwaita theme with
+                [`qadwaitadecorations`](https://github.com/FedoraQt/QAdwaitaDecorations)
+
+              `gnome` (deprecated)
               : Use GNOME theme with
-            [`qgnomeplatform`](https://github.com/FedoraQt/QGnomePlatform)
+                [`qgnomeplatform`](https://github.com/FedoraQt/QGnomePlatform).
+                Is no longer maintained so prefer `adwaita`.
 
               `lxqt`
               : Use LXQt theme style set using the
@@ -104,7 +113,28 @@ in {
               : Use Qt settings from Plasma
             '';
           };
-
+          package = lib.mkOption {
+            type = with lib.types; nullOr (either package (listOf package));
+            default = null;
+            example =
+              lib.literalExpression "[pkgs.adwaita-qt pkgs.adwaita-qt6]";
+            description = ''
+              Theme package to be used in Qt5/Qt6 applications.
+              Auto-detected from {option}`qt.platformTheme.name` if possible.
+              See its documentation for available options.
+            '';
+          };
+        };
+      in lib.mkOption {
+        type = with lib.types;
+          nullOr
+          (either (enum [ "gtk" "gtk3" "gnome" "adwaita" "lxqt" "qtct" "kde" ])
+            (lib.types.submodule { options = newOption; }));
+        default = null;
+        description = ''
+          Deprecated. Use {option}`qt.platformTheme.name` instead.
+        '';
+      };
       style = {
         name = lib.mkOption {
           type = with lib.types; nullOr str;
@@ -149,6 +179,7 @@ in {
           description = ''
             Theme package to be used in Qt5/Qt6 applications.
             Auto-detected from {option}`qt.style.name` if possible.
+            See its documentation for available options.
           '';
         };
       };
@@ -156,11 +187,24 @@ in {
   };
 
   config = let
+    platformTheme = if (builtins.isString cfg.platformTheme) then {
+      option = "qt.platformTheme";
+      name = cfg.platformTheme;
+      package = null;
+    } else if cfg.platformTheme == null then {
+      option = null;
+      name = null;
+      package = null;
+    } else {
+      option = "qt.platformTheme.name";
+      name = cfg.platformTheme.name;
+      package = cfg.platformTheme.package;
+    };
 
     # Necessary because home.sessionVariables doesn't support mkIf
     envVars = lib.filterAttrs (n: v: v != null) {
-      QT_QPA_PLATFORMTHEME = if (cfg.platformTheme != null) then
+      QT_QPA_PLATFORMTHEME = if (platformTheme.name != null) then
-        styleNames.${cfg.platformTheme} or cfg.platformTheme
+        styleNames.${platformTheme.name} or platformTheme.name
       else
         null;
       QT_STYLE_OVERRIDE = cfg.style.name;
@@ -181,14 +225,20 @@ in {
 
   in lib.mkIf cfg.enable {
     assertions = [{
-      assertion = cfg.platformTheme == "gnome" -> cfg.style.name != null
+      assertion = platformTheme.name == "gnome" -> cfg.style.name != null
         && cfg.style.package != null;
       message = ''
-        `qt.platformTheme` "gnome" must have `qt.style` set to a theme that
+        `qt.platformTheme.name` "gnome" must have `qt.style` set to a theme that
         supports both Qt and Gtk, for example "adwaita", "adwaita-dark", or "breeze".
       '';
     }];
 
+    warnings = (lib.lists.optional (platformTheme.option == "qt.platformTheme")
+      "The option `qt.platformTheme` has been renamed to `qt.platformTheme.name`.")
+      ++ (lib.lists.optional
+        (platformTheme.name == "gnome" && platformTheme.package == null)
+        "The value `gnome` for option `${platformTheme.option}` is deprecated. Use `adwaita` instead.");
+
     qt.style.package = lib.mkIf (cfg.style.name != null)
       (lib.mkDefault (stylePackages.${lib.toLower cfg.style.name} or null));
 
@@ -208,13 +258,16 @@ in {
     # Apply theming also to apps started by systemd.
     systemd.user.sessionVariables = envVars // envVarsExtra;
 
-    home.packages = (lib.optionals (cfg.platformTheme != null)
+    home.packages = (lib.findFirst (x: x != null) [ ] [
-      platformPackages.${cfg.platformTheme} or [ ])
+      (lib.optionals (platformTheme.package != null)
-      ++ (lib.optionals (cfg.style.package != null)
+        (lib.toList platformTheme.package))
+      (lib.optionals (platformTheme.name != null)
+        platformPackages.${platformTheme.name})
+    ]) ++ (lib.optionals (cfg.style.package != null)
       (lib.toList cfg.style.package));
 
     xsession.importedVariables = [ "QT_PLUGIN_PATH" "QML2_IMPORT_PATH" ]
-      ++ lib.optionals (cfg.platformTheme != null) [ "QT_QPA_PLATFORMTHEME" ]
+      ++ lib.optionals (platformTheme.name != null) [ "QT_QPA_PLATFORMTHEME" ]
       ++ lib.optionals (cfg.style.name != null) [ "QT_STYLE_OVERRIDE" ];
   };
 }

tests/modules/misc/qt/qt-basic.nix

@@ -1,5 +1,3 @@
-{ config, lib, pkgs, ... }:
-
 {
   config = {
     qt.enable = true;

tests/modules/misc/qt/qt-platform-theme-gnome.nix

@@ -1,9 +1,8 @@
-{ config, lib, pkgs, ... }:
-
 {
   config = {
     qt = {
       enable = true;
+      # Check if still backwards compatible
       platformTheme = "gnome";
       style.name = "adwaita";
     };
@@ -20,5 +19,9 @@
       assertFileRegex home-path/etc/profile.d/hm-session-vars.sh \
         'QML2_IMPORT_PATH'
     '';
+    test.asserts.warnings.expected = [
+      "The option `qt.platformTheme` has been renamed to `qt.platformTheme.name`."
+      "The value `gnome` for option `qt.platformTheme` is deprecated. Use `adwaita` instead."
+    ];
   };
 }

tests/modules/misc/qt/qt-platform-theme-gtk.nix

@@ -1,10 +1,8 @@
-{ config, lib, pkgs, ... }:
-
 {
   config = {
     qt = {
       enable = true;
-      platformTheme = "gtk";
+      platformTheme.name = "gtk";
     };
     i18n.inputMethod.enabled = "fcitx5";
 

tests/modules/misc/qt/qt-platform-theme-gtk3.nix

@@ -1,10 +1,8 @@
-{ config, lib, pkgs, ... }:
-
 {
   config = {
     qt = {
       enable = true;
-      platformTheme = "gtk3";
+      platformTheme.name = "gtk3";
     };
 
     nmt.script = ''