diff --git a/modules/core/default.nix b/modules/core/default.nix
index 3f53b87..849878a 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -20,6 +20,5 @@
     ++ [(import ./system.nix)]
     ++ [(import ./user.nix)]
     ++ [(import ./wayland.nix)]
-    ++ [(import ./variables.nix)]
     ++ [(import ./virtualisation.nix)];
 }
diff --git a/modules/core/variables.nix b/modules/core/variables.nix
deleted file mode 100644
index 8dbaeef..0000000
--- a/modules/core/variables.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{...}: {
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
-  environment.sessionVariables.XKB_DEFAULT_LAYOUT = "es";
-}
diff --git a/modules/core/wayland.nix b/modules/core/wayland.nix
index beb5b28..d2619a1 100644
--- a/modules/core/wayland.nix
+++ b/modules/core/wayland.nix
@@ -25,4 +25,6 @@
       background.path = pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath;
     };
   };
+
+  environment.sessionVariables.XKB_DEFAULT_LAYOUT = "es";
 }
diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix
index 06ad500..4ecd1fc 100644
--- a/modules/home/hyprland/config.nix
+++ b/modules/home/hyprland/config.nix
@@ -3,9 +3,6 @@
     settings = {
       # autostart
       exec-once = [
-        "systemctl --user import-environment &"
-        "hash dbus-update-activation-environment 2>/dev/null &"
-        "dbus-update-activation-environment --systemd --all &"
         "nm-applet &"
         "wl-clip-persist --clipboard both &"
         "bash -c 'if [ ! -f ~/.config/hypr/wallpaper.png ]; then wall-change ~/.config/hypr/default_wallpaper.png; fi'"
diff --git a/modules/home/hyprland/variables.nix b/modules/home/hyprland/variables.nix
index 4b73662..7c22466 100644
--- a/modules/home/hyprland/variables.nix
+++ b/modules/home/hyprland/variables.nix
@@ -1,4 +1,8 @@
-{...}: {
+{
+  lib,
+  config,
+  ...
+}: {
   home.sessionVariables = {
     NIXOS_OZONE_WL = "1";
     ELECTRON_OZONE_PLATFORM_HINT = "auto";
@@ -13,16 +17,18 @@
     WLR_DRM_NO_ATOMIC = "1";
     QT_AUTO_SCREEN_SCALE_FACTOR = "1";
     QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
-    QT_QPA_PLATFORM = "xcb";
+    QT_QPA_PLATFORM = "wayland";
     QT_QPA_PLATFORMTHEME = "qt5ct";
     QT_STYLE_OVERRIDE = "kvantum";
     MOZ_ENABLE_WAYLAND = "1";
     WLR_BACKEND = "vulkan";
-    WLR_RENDERER = "vulkan";
     WLR_NO_HARDWARE_CURSORS = "1";
     XDG_SESSION_TYPE = "wayland";
     SDL_VIDEODRIVER = "wayland";
     CLUTTER_BACKEND = "wayland";
     GTK_THEME = "Dracula";
   };
+
+  wayland.windowManager.hyprland.systemd.variables = ["--all"];
+  wayland.windowManager.hyprland.settings.env = lib.attrsets.mapAttrsToList (name: value: "${name},${builtins.toString value}") config.home.sessionVariables;
 }