diff --git a/flake.nix b/flake.nix
index 133529f0..3223ffd8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,8 +45,6 @@
     # Hyprland Plugins
     hyprland-plugins.url = "github:hyprwm/hyprland-plugins";
     hyprland-plugins.inputs.hyprland.follows = "hyprland";
-    # Up to date waybar flake
-    waybar.url = "github:Alexays/Waybar";
   };
   outputs = { self, nixpkgs, nixpkgs-wayland, home-manager, lanzaboote, nur, sops-nix, doom-emacs, nixos-generators, deploy-rs, ... } @inputs:
   let
diff --git a/home-manager/common/desktops/hyprland/components/waybar.nix b/home-manager/common/desktops/hyprland/components/waybar.nix
index 30d69ae0..3e5fd6be 100644
--- a/home-manager/common/desktops/hyprland/components/waybar.nix
+++ b/home-manager/common/desktops/hyprland/components/waybar.nix
@@ -3,7 +3,6 @@
 
   programs.waybar = {
     enable = true;
-    package = inputs.waybar.packages.waybar;
     settings = {
         mainBar = {
             layer = "top";
diff --git a/nixos/common/desktops/hyprland/default.nix b/nixos/common/desktops/hyprland/default.nix
index 4d58e63c..6d248dd3 100644
--- a/nixos/common/desktops/hyprland/default.nix
+++ b/nixos/common/desktops/hyprland/default.nix
@@ -108,6 +108,7 @@
 
   # system packages
   environment.systemPackages = [
+    pkgs.waybar               # taskbar
     pkgs.libnotify            # Notification libraries
     pkgs.mako                 # Notification daemon
     pkgs.swww                 # Wallpaper daemon
@@ -141,7 +142,6 @@
 
     # wayland-packages
     inputs.nixpkgs-wayland.packages.${platform}.wayprompt  # from nixpkgs-wayland exclusively - pinentry UI
-    inputs.waybar.packages.${platform}.waybar
   ];
 
   # Enable sound with pipewire.