From 286757a8c967753bdb72ffb14c6eddff6b574eb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
Date: Tue, 10 Jan 2023 21:05:07 +0100
Subject: [PATCH] Squash theme issues maybe

---
 config/desktop.nix          | 4 ++--
 config/programs/sway.nix    | 1 +
 config/programs/theming.nix | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/desktop.nix b/config/desktop.nix
index 0fda6e44..b53b4ae0 100644
--- a/config/desktop.nix
+++ b/config/desktop.nix
@@ -105,9 +105,9 @@ in {
   networking.firewall.allowedUDPPorts = [22000];
 
   environment.systemPackages = with pkgs; [
-    pinentry-gtk2
+    pinentry-qt
   ];
-  programs.gnupg.agent.pinentryFlavor = "gtk2";
+  programs.gnupg.agent.pinentryFlavor = "qt";
 
   xdg.portal = {
     enable = true;
diff --git a/config/programs/sway.nix b/config/programs/sway.nix
index 01a132d9..b987cfa2 100644
--- a/config/programs/sway.nix
+++ b/config/programs/sway.nix
@@ -140,6 +140,7 @@ in {
       export GDK_DPI_SCALE=1
       export MOZ_ENABLE_WAYLAND=1
       export _JAVA_AWT_WM_NONREPARENTING=1
+      export QT_QPA_PLATFORMTHEME=qt5ct
     '';
     extraConfig = ''
       default_border none
diff --git a/config/programs/theming.nix b/config/programs/theming.nix
index 093776f1..a4bf3489 100644
--- a/config/programs/theming.nix
+++ b/config/programs/theming.nix
@@ -38,7 +38,6 @@ in {
   };
   qt = {
     enable = true;
-    platformTheme = "gnome";
     style = {
       name = "Breeze";
       package = pkgs.libsForQt5.breeze-qt5;
@@ -201,7 +200,7 @@ in {
     client.background        ${cssColor base}
     seat seat0 xcursor_theme breeze-dark 24
   '';
-  home.packages = with pkgs; [ libsForQt5.breeze-icons vanilla-dmz ];
+  home.packages = with pkgs; [ libsForQt5.breeze-icons libsForQt5.qt5ct vanilla-dmz ];
 
   programs.foot.settings.colors = with theme; {
     alpha = 0.9;