From ad0780915c7f94d2cfcaed85178e30bd1f8eb6fe Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Mon, 23 Oct 2023 13:21:16 +0100
Subject: [PATCH] Add extra theming settings to hyprland config

---
 home/hyprland/config.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 164cf372..994c04ce 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -1,20 +1,19 @@
 { config, pkgs, ... }:
-let cursorSize = 24;
+let
+  themeName = config.gtk.theme.name;
+  cursorName = config.gtk.cursorTheme.name;
+  cursorSize = "24";
 in ''
   source = ./extra.conf
   monitor=,preferred,auto,auto
 
-  exec-once = hyprctl setcursor ${config.gtk.cursorTheme.name} ${
-    toString cursorSize
-  }
-
   env = XDG_CURRENT_DESKTOP=Hyprland
   env = XDG_SESSION_TYPE=wayland
   env = XDG_SESSION_DESKTOP=Hyprland
   env = GDK_BACKEND=wayland,x11
-  env = GTK_THEME,${config.gtk.theme.name}
-  env = XCURSOR_THEME,${config.gtk.cursorTheme.name}
-  env = XCURSOR_SIZE,${toString cursorSize}
+  env = GTK_THEME,${themeName}
+  env = XCURSOR_THEME,${cursorName}
+  env = XCURSOR_SIZE,${cursorSize}
   env = QT_AUTO_SCREEN_SCALE_FACTOR,1
   env = QT_QPA_PLATFORM,wayland
   env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
@@ -22,6 +21,10 @@ in ''
   env = DOOMLOCALDIR=${config.home.sessionVariables.DOOMLOCALDIR};
   env = DOOMPROFILELOADFILE=${config.home.sessionVariables.DOOMPROFILELOADFILE};
 
+  exec-once = hyprctl setcursor ${cursorName} ${cursorSize}
+  exec-once = dbus-update-activation-environment --systemd --all
+  exec-once = systemctl --user import-environment WAYLAND_DISPLAY QT_QPA_PLATFORMTHEME
+
   misc {
     disable_autoreload = true
     vrr = 2