Merge pull request #67097 from worldofpeace/pantheon-qtconfig

nixos/pantheon: use qt5 module for adwaita-qt
This commit is contained in:
worldofpeace 2019-08-20 13:13:41 -04:00 committed by GitHub
commit 7dd98389c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -99,10 +99,6 @@ in
fi fi
'') cfg.sessionPath} '') cfg.sessionPath}
# Makes qt applications look less alien
export QT_QPA_PLATFORMTHEME=gtk3
export QT_STYLE_OVERRIDE=adwaita
# Settings from elementary-default-settings # Settings from elementary-default-settings
export GTK_CSD=1 export GTK_CSD=1
export GTK_MODULES=$GTK_MODULES:pantheon-filechooser-module export GTK_MODULES=$GTK_MODULES:pantheon-filechooser-module
@ -150,6 +146,11 @@ in
programs.evince.enable = mkDefault true; programs.evince.enable = mkDefault true;
programs.file-roller.enable = mkDefault true; programs.file-roller.enable = mkDefault true;
# Harmonize Qt5 applications under Pantheon
qt5.enable = true;
qt5.platformTheme = "gnome";
qt5.style = "adwaita";
networking.networkmanager.enable = mkDefault true; networking.networkmanager.enable = mkDefault true;
networking.networkmanager.basePackages = networking.networkmanager.basePackages =
{ inherit (pkgs) networkmanager modemmanager wpa_supplicant crda; { inherit (pkgs) networkmanager modemmanager wpa_supplicant crda;