Use uwsm to set desktop variables, not hyprland

modules/home/default.nix

@@ -25,7 +25,6 @@
     ++ [(import ./nextcloud.nix)] # nextcloud client
     ++ [(import ./nvim.nix)] # neovim editor
     ++ [(import ./packages.nix)] # other packages
-    ++ [(import ./retroarch.nix)]
     ++ [(import ./scripts)] # personal scripts
     ++ [(import ./spotify.nix)]
     ++ [(import ./starship.nix)] # shell prompt

modules/home/gaming.nix

@@ -4,6 +4,8 @@
   inputs,
   ...
 }: {
+  imports = [(import ./retroarch.nix)];
+
   home.packages = with pkgs; [
     ## Utils
     # gamemode

modules/home/hyprland/variables.nix

@@ -1,31 +1,31 @@
-{
-  lib,
-  config,
-  ...
-}: {
-  home.sessionVariables = {
-    NIXOS_OZONE_WL = "1";
+{lib, ...}: let
+  variables = {
+    NIXOS_OZONE_WL = 1;
     ELECTRON_OZONE_PLATFORM_HINT = "auto";
-    __GL_GSYNC_ALLOWED = "0";
-    __GL_VRR_ALLOWED = "0";
-    _JAVA_AWT_WM_NONEREPARENTING = "1";
-    DISABLE_QT5_COMPAT = "0";
-    GDK_BACKEND = "wayland";
-    ANKI_WAYLAND = "1";
+    __GL_GSYNC_ALLOWED = 0;
+    __GL_VRR_ALLOWED = 0;
+    _JAVA_AWT_WM_NONEREPARENTING = 1;
+    DISABLE_QT5_COMPAT = 0;
+    GDK_BACKEND = "wayland,x11,*";
+    ANKI_WAYLAND = 1;
     DIRENV_LOG_FORMAT = "";
-    WLR_DRM_NO_ATOMIC = "1";
-    QT_AUTO_SCREEN_SCALE_FACTOR = "1";
-    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
-    QT_QPA_PLATFORM = "wayland";
-    MOZ_ENABLE_WAYLAND = "1";
-    MOZ_USE_XINPUT2 = "1";
+    WLR_DRM_NO_ATOMIC = 1;
+    QT_AUTO_SCREEN_SCALE_FACTOR = 1;
+    QT_WAYLAND_DISABLE_WINDOWDECORATION = 1;
+    QT_QPA_PLATFORM = "wayland;xcb";
+    MOZ_ENABLE_WAYLAND = 1;
+    MOZ_USE_XINPUT2 = 1;
     WLR_BACKEND = "vulkan";
-    WLR_NO_HARDWARE_CURSORS = "1";
-    XDG_SESSION_TYPE = "wayland";
     SDL_VIDEODRIVER = "wayland";
     CLUTTER_BACKEND = "wayland";
   };
+in {
+  home.sessionVariables = variables;
 
-  wayland.windowManager.hyprland.systemd.variables = ["--all"];
-  wayland.windowManager.hyprland.settings.env = lib.attrsets.mapAttrsToList (name: value: "${name},${builtins.toString value}") config.home.sessionVariables;
+  xdg.configFile."uwsm/env".text = builtins.concatStringsSep "\n" (
+    lib.attrsets.mapAttrsToList (
+      name: value: "export ${name}=\"${builtins.toString value}\""
+    )
+    variables
+  );
 }

modules/home/waybar/default.nix

@@ -1,33 +1,4 @@
-{...}: let
-  custom = {
-    font = "JetBrainsMono Nerd Font";
-    fontsize = "12";
-    primary_accent = "cba6f7";
-    secondary_accent = "89b4fa";
-    tertiary_accent = "f5f5f5";
-    background = "11111B";
-    opacity = "0.98";
-    cursor = "Numix-Cursor";
-    palette = rec {
-      primary_accent_hex = "cba6f7";
-      secondary_accent_hex = "89b4fa";
-      tertiary_accent_hex = "f5f5f5";
-      primary_background_hex = "11111B";
-      secondary_background_hex = "1b1b2b";
-      tertiary_background_hex = "25253a";
-
-      primary_accent_rgba = "rgba(203,166,247,${opacity})";
-      secondary_accent_rgba = "rgba(137,180,250,${opacity})";
-      tertiary_accent_rgba = "rgba(245,245,245,${opacity})";
-      primary_background_rgba = "rgba(17,17,27,${opacity})";
-      secondary_background_rgba = "rgba(27,27,43,${opacity})";
-      tertiary_background_rgba = "rgba(37,37,58,${opacity})";
-
-      opacity = "1";
-    };
-  };
-in {
-  _module.args = {inherit custom;};
+{...}: {
   imports =
     [(import ./waybar.nix)]
     ++ [(import ./settings.nix)]