diff --git a/home/shahab/common/optional/hyprland.nix b/home/shahab/common/optional/hyprland.nix
index 5ae7548..7cc52b1 100644
--- a/home/shahab/common/optional/hyprland.nix
+++ b/home/shahab/common/optional/hyprland.nix
@@ -21,13 +21,6 @@
     };
 
     packages = with pkgs; [
-      hyprshot
-      hyprlock
-      hypridle
-      hyprpolkitagent
-      waybar
-      wofi
-      mako
       sassc
       nwg-look
     ];
diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix
index 146b0a0..edae3b3 100644
--- a/hosts/common/core/default.nix
+++ b/hosts/common/core/default.nix
@@ -53,6 +53,7 @@
       trusted-users = ["@wheel"];
 
       substituters = ["https://hyprland.cachix.org" "https://nix.dogar.dev"];
+      trusted-substituters = ["https://hyprland.cachix.org"];
       trusted-public-keys = [
         "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
       ];
diff --git a/hosts/common/optional/hyprland.nix b/hosts/common/optional/hyprland.nix
index a4bbc58..7e345f2 100644
--- a/hosts/common/optional/hyprland.nix
+++ b/hosts/common/optional/hyprland.nix
@@ -2,14 +2,20 @@
   pkgs,
   ...
 }: {
-  programs.hyprland = {
-    enable = true;
+  programs = {
+    hyprland = {
+      enable = true;
+      xwayland.enable = true;
+      systemd.setPath.enable = true;
+    };
+
+    hyprlock.enable = true;
   };
 
+  services.hypridle.enable = true;
+
   environment.systemPackages = with pkgs; [
     hyprshot
-    hyprlock
-    hypridle
     hyprpolkitagent
     mako
     waybar