diff --git a/hosts/configuration.nix b/hosts/configuration.nix
index a9a5a97..ed3ccc3 100644
--- a/hosts/configuration.nix
+++ b/hosts/configuration.nix
@@ -74,21 +74,7 @@
       TERMINAL = "alacritty";
       EDITOR = "nvim";
       VISUAL = "nvim";
-      MOZ_ENABLE_WAYLAND = "1";
-      MOZ_WEBRENDER = "1";
-      MOZ_USE_XINPUT2 = "2";
-      MOZ_DBUS_REMOTE = "1";
-      GDK_BACKEND = "wayland";
-      LIBVA_DRIVER_NAME = "iHD";
-      VDPAU_DRIVER = "iHD";
-      XDG_SESSION_TYPE = "wayland";
-      XDG_CURRENT_DESKTOP = "sway";
-      QT_QPA_PLATFORMTHEME = "qt5ct";
-      GST_VAAPI_ALL_DRIVERS = "1";
       BROWSER = "firefox";
-      GTK_THEME = "Arc";
-      _JAVA_AWT_WM_NONREPARENTING = "1";
-
     };
     systemPackages = with pkgs; [           # Default packages install system-wide
       vim
diff --git a/modules/desktop/hyprland/default.nix b/modules/desktop/hyprland/default.nix
index 3902fe1..3c14f04 100644
--- a/modules/desktop/hyprland/default.nix
+++ b/modules/desktop/hyprland/default.nix
@@ -33,6 +33,19 @@
       fi
     '';                                   # Will automatically open sway when logged into tty1
     variables = {
+      MOZ_ENABLE_WAYLAND = "1";
+      MOZ_WEBRENDER = "1";
+      MOZ_USE_XINPUT2 = "2";
+      MOZ_DBUS_REMOTE = "1";
+      GDK_BACKEND = "wayland";
+      LIBVA_DRIVER_NAME = "iHD";
+      VDPAU_DRIVER = "iHD";
+      XDG_SESSION_TYPE = "wayland";
+      XDG_CURRENT_DESKTOP = "sway";
+      QT_QPA_PLATFORMTHEME = "qt5ct";
+      GST_VAAPI_ALL_DRIVERS = "1";
+      GTK_THEME = "Arc";
+      _JAVA_AWT_WM_NONREPARENTING = "1";
       #LIBCL_ALWAYS_SOFTWARE = "1";       # For applications in VM like alacritty to work
       #WLR_NO_HARDWARE_CURSORS = "1";     # For cursor in VM
     };