diff --git a/options/custom/desktops/hyprland/binds.nix b/options/custom/desktops/hyprland/binds.nix
index 6c567eb..e76dbc2 100644
--- a/options/custom/desktops/hyprland/binds.nix
+++ b/options/custom/desktops/hyprland/binds.nix
@@ -11,7 +11,7 @@ with lib; let
   codium = "${config.home-manager.users.${config.custom.username}.programs.vscode.package}/bin/codium";
   firefox-esr = "${config.home-manager.users.${config.custom.username}.programs.firefox.finalPackage}/bin/firefox-esr";
   gnome-text-editor = "${pkgs.gnome-text-editor}/bin/gnome-text-editor";
-  hyprctl = "${pkgs.hyprland}/bin/hyprctl";
+  hyprctl = "${config.programs.hyprland.package}/bin/hyprctl";
   hyprlock = "${config.home-manager.users.${config.custom.username}.programs.hyprlock.package}/bin/hyprlock";
   hyprpicker = "${pkgs.hyprpicker}/bin/hyprpicker";
   inhibit = "~/.local/bin/inhibit";
diff --git a/options/custom/desktops/hyprland/plugins.nix b/options/custom/desktops/hyprland/plugins.nix
index 7c77aab..a5813ae 100644
--- a/options/custom/desktops/hyprland/plugins.nix
+++ b/options/custom/desktops/hyprland/plugins.nix
@@ -5,7 +5,7 @@
   ...
 }:
 with lib; let
-  hyprctl = "${pkgs.hyprland}/bin/hyprctl";
+  hyprctl = "${config.programs.hyprland.package}/bin/hyprctl";
 
   cfg = config.custom.desktops.hyprland.plugins;
 in {
diff --git a/options/custom/desktops/hyprland/rules.nix b/options/custom/desktops/hyprland/rules.nix
index db37024..ec7878d 100644
--- a/options/custom/desktops/hyprland/rules.nix
+++ b/options/custom/desktops/hyprland/rules.nix
@@ -6,6 +6,7 @@
 }:
 with lib; let
   gamescope = "${config.programs.gamescope.package}/bin/gamescope";
+  hyprctl = "${config.programs.hyprland.package}/bin/hyprctl";
   kitty = "${config.home-manager.users.${config.custom.username}.programs.kitty.package}/bin/kitty";
   loupe = "${pkgs.loupe}/bin/loupe";
   onlyoffice = "${pkgs.onlyoffice-bin}/bin/onlyoffice-desktopeditors";
diff --git a/options/custom/programs/waybar/default.nix b/options/custom/programs/waybar/default.nix
index 17fbeb8..e62fc2b 100644
--- a/options/custom/programs/waybar/default.nix
+++ b/options/custom/programs/waybar/default.nix
@@ -10,9 +10,7 @@ with lib; let
   bluetoothctl = "${pkgs.bluez}/bin/bluetoothctl";
   easyeffects = "${pkgs.easyeffects}/bin/easyeffects";
   echo = "${pkgs.coreutils}/bin/echo";
-  hyprctl = "${
-    config.home-manager.users.${config.custom.username}.wayland.windowManager.hyprland.finalPackage
-  }/bin/hyprctl";
+  hyprctl = "${config.programs.hyprland.package}/bin/hyprctl";
   inhibit = config.home-manager.users.${config.custom.username}.home.file.".local/bin/inhibit".source;
   jq = "${pkgs.jq}/bin/jq";
   loginctl = "${pkgs.systemd}/bin/loginctl";
diff --git a/options/custom/services/hypridle.nix b/options/custom/services/hypridle.nix
index dc8a1cd..3f0f488 100644
--- a/options/custom/services/hypridle.nix
+++ b/options/custom/services/hypridle.nix
@@ -6,9 +6,7 @@
 }:
 with lib; let
   grep = "${pkgs.gnugrep}/bin/grep";
-  hyprctl = "${
-    config.home-manager.users.${config.custom.username}.wayland.windowManager.hyprland.finalPackage
-  }/bin/hyprctl";
+  hyprctl = "${config.programs.hyprland.package}/bin/hyprctl";
   hyprlock = "${
     config.home-manager.users.${config.custom.username}.programs.hyprlock.package
   }/bin/hyprlock";
diff --git a/options/custom/services/swayidle.nix b/options/custom/services/swayidle.nix
index 20f7a9f..f2c50f9 100644
--- a/options/custom/services/swayidle.nix
+++ b/options/custom/services/swayidle.nix
@@ -6,9 +6,7 @@
 }:
 with lib; let
   chayang = "${pkgs.chayang}/bin/chayang";
-  hyprctl = "${
-    config.home-manager.users.${config.custom.username}.wayland.windowManager.hyprland.package
-  }/bin/hyprctl";
+  hyprctl = "${config.programs.hyprland.package}/bin/hyprctl";
   loginctl = "${pkgs.systemd}/bin/loginctl";
   pgrep = "${pkgs.procps}/bin/pgrep";
   swaylock = "${