JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixos/qt5: rename to qt

Browse Source
This commit is contained in:
gnidorah 2019-10-13 08:55:36 +03:00
parent 379c3f685c
commit 1bd7ea84ad
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nixos/modules/config/qt5.nix → nixos/modules/config/qt.nix
View File

@ -4,7 +4,7 @@ with lib;
let
cfg = config.qt5;
cfg = config.qt;
toQtIni = generators.toINI {
mkKeyValue = key: value:
@ -79,7 +79,7 @@ let
}
{
assertion = cfg.font == null && cfg.iconTheme == null;
message = "`qt5.font` and `qt5.iconTheme` are only supported by kde platform.";
message = "`qt.font` and `qt.iconTheme` are only supported by kde platform.";
}
];
environment.variables.QT_QPA_PLATFORMTHEME = "gtk2";
@ -99,7 +99,7 @@ let
assertions = [
{
assertion = cfg.font == null && cfg.iconTheme == null;
message = "`qt5.font` and `qt5.iconTheme` are only supported by kde platform.";
message = "`qt.font` and `qt.iconTheme` are only supported by kde platform.";
}
];
environment.variables.QT_QPA_PLATFORMTHEME = "qgnomeplatform";
@ -126,7 +126,7 @@ let
}
{
assertion = cfg.font == null && cfg.iconTheme == null;
message = "`qt5.font` and `qt5.iconTheme` are only supported by kde platform.";
message = "`qt.font` and `qt.iconTheme` are only supported by kde platform.";
}
];
environment.variables.QT_QPA_PLATFORMTHEME = "gtk3";
@ -155,16 +155,24 @@ in
{
options = {
qt5 = {
imports = [
(mkRenamedOptionModule [ "qt5" "style" ] [ "qt" "style" ])
(mkRenamedOptionModule [ "qt5" "enable" ] [ "qt" "enable" ])
(mkRenamedOptionModule [ "qt5" "platformTheme" ] [ "qt" "platformTheme" ])
(mkRenamedOptionModule [ "qt5" "font" ] [ "qt" "font" ])
(mkRenamedOptionModule [ "qt5" "iconTheme" ] [ "qt" "iconTheme" ])
];
enable = mkEnableOption "Qt5 theming configuration";
options = {
qt = {
enable = mkEnableOption "Qt theming configuration";
platformTheme = mkOption {
type = types.enum (attrNames platforms);
example = head (attrNames platforms);
description = ''
Selects the platform theme to use for Qt5 applications.</para>
Selects the platform theme to use for Qt applications.</para>
<para>The options are
<variablelist>
${concatStrings (mapAttrsToList (name: value: value.description) platforms)}

2
nixos/modules/module-list.nix
View File

@ -27,7 +27,7 @@
./config/nsswitch.nix
./config/power-management.nix
./config/pulseaudio.nix
./config/qt5.nix
./config/qt.nix
./config/resolvconf.nix
./config/shells-environment.nix
./config/swap.nix

6
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -242,9 +242,9 @@ in
programs.zsh.vteIntegration = mkDefault true;
# Harmonize Qt5 applications under Pantheon
qt5.enable = true;
qt5.platformTheme = "gnome";
qt5.style = "adwaita";
qt.enable = true;
qt.platformTheme = "qgnomeplatform";
qt.style.name = "adwaita";
# Default Fonts
fonts.fonts = with pkgs; [