Unverified Commit 85efefd8 authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

Merge pull request #248544 from bobby285271/rm/qgnomeplatform 

nixos/pantheon, nixos/cinnamon: Drop qgnomeplatform
parents c26c7080 ddd4973d

nixos/doc/manual/release-notes/rl-2311.section.md

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ 


- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.



- GNOME module no longer forces Qt applications to use Adwaita style since it was buggy and is no longer maintained upstream. If you still want it, you can add the following options to your configuration but it will probably be eventually removed:

- GNOME, Pantheon, Cinnamon module no longer forces Qt applications to use Adwaita style since it was buggy and is no longer maintained upstream. If you still want it, you can add the following options to your configuration but it will probably be eventually removed:



  ```nix

  qt = {

nixos/modules/services/x11/desktop-managers/cinnamon.nix

+0 −5
Original line number Diff line number Diff line
@@ -212,11 +212,6 @@ in 
      programs.bash.vteIntegration = mkDefault true;

      programs.zsh.vteIntegration = mkDefault true;



      # Harmonize Qt applications under Cinnamon

      qt.enable = true;

      qt.platformTheme = "gnome";

      qt.style = "adwaita";



      # Default Fonts

      fonts.packages = with pkgs; [

        source-code-pro # Default monospace font in 3.32

nixos/modules/services/x11/desktop-managers/pantheon.nix

+4 −5
Original line number Diff line number Diff line
@@ -200,7 +200,6 @@ in 
        gtk3.out # for gtk-launch program

        onboard

        orca # elementary/greeter#668

        qgnomeplatform

        sound-theme-freedesktop

        xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/

      ]) ++ (with pkgs.pantheon; [
@@ -260,10 +259,10 @@ in 
      programs.bash.vteIntegration = mkDefault true;

      programs.zsh.vteIntegration = mkDefault true;



      # Harmonize Qt applications under Pantheon

      qt.enable = true;

      qt.platformTheme = "gnome";

      qt.style = "adwaita";

      # Use native GTK file chooser on Qt apps. This is because Qt does not know Pantheon.

      # https://invent.kde.org/qt/qt/qtbase/-/blob/6.6/src/gui/platform/unix/qgenericunixthemes.cpp#L1312

      # https://github.com/elementary/default-settings/blob/7.0.2/profile.d/qt-qpa-platformtheme.sh

      environment.variables.QT_QPA_PLATFORMTHEME = mkDefault "gtk3";



      # Default Fonts

      fonts.packages = with pkgs; [