diff --git a/modules/applications/steam/default.nix b/modules/applications/steam/default.nix
index cb00c75..01a2b5f 100644
--- a/modules/applications/steam/default.nix
+++ b/modules/applications/steam/default.nix
@@ -1,6 +1,7 @@
-{
+{pkgs, ...}: {
   programs.steam = {
     enable = true;
+    package = pkgs.unstable.steam;
     gamescopeSession.enable = true;
   };
 }
diff --git a/modules/hyprland.nix b/modules/hyprland.nix
index a8ed061..b4d32fe 100644
--- a/modules/hyprland.nix
+++ b/modules/hyprland.nix
@@ -1,12 +1,19 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  inputs,
+  ...
+}: let
+  pkgs-hyprland = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system};
+in {
   programs.hyprland = {
     enable = true;
-    package = pkgs.unstable.hyprland;
+    package = inputs.hyprland.packages.${pkgs.system}.hyprland;
   };
 
   hardware.opengl = {
-    package = pkgs.unstable.mesa.drivers;
-    package32 = pkgs.unstable.pkgsi686Linux.mesa.drivers;
+    package = pkgs-hyprland.mesa.drivers;
+    driSupport32Bit = true;
+    package32 = pkgs-hyprland.pkgsi686Linux.mesa.drivers;
   };
 
   services.gnome.gnome-keyring.enable = true;
diff --git a/user/modules/hyprland.nix b/user/modules/hyprland.nix
index 2903777..f9cfd24 100644
--- a/user/modules/hyprland.nix
+++ b/user/modules/hyprland.nix
@@ -1,6 +1,11 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  inputs,
+  ...
+}: {
   imports = [
     ./waybar
+    inputs.hyprland.homeManagerModules.default
     ./wofi.nix
   ];
 
@@ -11,7 +16,7 @@
 
   wayland.windowManager.hyprland = {
     enable = true;
-    package = pkgs.unstable.hyprland;
+    package = inputs.hyprland.packages.${pkgs.system}.hyprland;
     settings = {
       "$mod" = "SUPER";
       general = {