diff --git a/flake.nix b/flake.nix
index 54b51216..3a6356f9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,12 +41,7 @@
     plasma-manager.url = "github:pjones/plasma-manager";
     plasma-manager.inputs.nixpkgs.follows = "nixpkgs";
     # Hyprland Flake
-    # Hyprland issue 6816
-#    hyprland.url = "https://github.com/hyprwm/Hyprland?submodules=1&ref=v0.41.2";
     hyprland.url = "github:hyprwm/Hyprland";
-    # Hyprland plugins:
-    hyprland-plugins.url = "github:hyprwm/hyprland-plugins";
-    # hyprland-plugins.inputs.hyprland.follows = "hyprland";
   };
   outputs = { self, nixpkgs, sops-nix, deploy-rs, ... } @inputs:
   let
diff --git a/home-manager/common/desktops/hyprland/components/hyprland.nix b/home-manager/common/desktops/hyprland/components/hyprland.nix
index 4bb5c218..f2819b31 100644
--- a/home-manager/common/desktops/hyprland/components/hyprland.nix
+++ b/home-manager/common/desktops/hyprland/components/hyprland.nix
@@ -1,10 +1,9 @@
-{ inputs, pkgs, ... }: {
+{ pkgs, ... }: {
   wayland.windowManager.hyprland = {
     enable = true;
-    package = inputs.hyprland.packages.${pkgs.system}.hyprland;
-    plugins = [
-      inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo
-      inputs.hyprland-plugins.packages.${pkgs.system}.hyprbars 
+    plugins = with pkgs.hyprlandPlugins; [
+      hyprbars
+      hyprexpo
     ];
     extraConfig = ''
       # Resize