Work around home.sessionVariables

spikespaz · Aug 31, 2022 · d0b3663 · d0b3663
1 parent 313b1c8
commit d0b3663
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/system/configuration.nix b/system/configuration.nix
@@ -150,19 +150,6 @@
     exfatprogs
   ];
 
-  environment.sessionVariables = {
-    # Qt doesn't work well with wayland on wlroots compositors.
-    # Run programs under Xwayland to ensure that popup menus are visible.
-    # QT_QPA_PLATFORM = "wayland";
-    QT_QPA_PLATFORM = "xcb";
-    # QT_QPA_PLATFORMTHEME = "qt5ct";
-    SDL_VIDEODRIVER = "wayland";
-    GTK_USE_PORTAL = "1";
-    MOZ_ENABLE_WAYLAND = "1";
-    _JAVA_AWT_WM_NONREPARENTING = "1";
-    XCURSOR_SIZE = "24";
-  };
-
   users.users = {
     jacob = {
       description = "Jacob Birkett";

diff --git a/users/jacob/profile.nix b/users/jacob/profile.nix
@@ -17,6 +17,9 @@
   # nixpkgs.config.allowUnfree = true;
   nixpkgs.config.allowUnfreePredicate = _: true;
 
+  # fix for some display managers not using ~/.profile
+  systemd.user.sessionVariables = config.home.sessionVariables;
+
   home.stateVersion = "22.05";
 
   ###################
@@ -30,6 +33,19 @@
   xdg.userDirs.enable = true;
   xdg.userDirs.createDirectories = true;
 
+  home.sessionVariables = {
+    # Qt doesn't work well with wayland on wlroots compositors.
+    # Run programs under Xwayland to ensure that popup menus are visible.
+    # QT_QPA_PLATFORM = "wayland";
+    QT_QPA_PLATFORM = "xcb";
+    # QT_QPA_PLATFORMTHEME = "qt5ct";
+    QT_QPA_PLATFORMTHEME = "lxqt";
+    SDL_VIDEODRIVER = "wayland";
+    GTK_USE_PORTAL = "1";
+    MOZ_ENABLE_WAYLAND = "1";
+    _JAVA_AWT_WM_NONREPARENTING = "1";
+  };
+
   ##############################
   ### MISCELLANEOUS SOFTWARE ###
   ##############################
@@ -74,7 +90,6 @@
 
   programs.obs-studio.enable = true;
 
-
   ###########################
   ### DESKTOP ENVIRONMENT ###
   ###########################