diff --git a/flake.lock b/flake.lock
index 8d59be7..01780be 100644
--- a/flake.lock
+++ b/flake.lock
@@ -76,6 +76,22 @@
         "type": "github"
       }
     },
+    "flake-compat_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -478,6 +494,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1711163522,
+        "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixvim": {
       "inputs": {
         "devshell": "devshell",
@@ -553,7 +585,8 @@
         "nixpkgs": "nixpkgs_3",
         "nixvim": "nixvim",
         "sops-nix": "sops-nix",
-        "spicetify-nix": "spicetify-nix"
+        "spicetify-nix": "spicetify-nix",
+        "waybar": "waybar"
       }
     },
     "sf-arabic": {
@@ -719,6 +752,25 @@
         "type": "github"
       }
     },
+    "waybar": {
+      "inputs": {
+        "flake-compat": "flake-compat_3",
+        "nixpkgs": "nixpkgs_5"
+      },
+      "locked": {
+        "lastModified": 1714631500,
+        "narHash": "sha256-yrUm8IX8mZJdpJHrd/Pd/pJYycjppe8YmqtT0yAXSkU=",
+        "owner": "Alexays",
+        "repo": "waybar",
+        "rev": "79ae530bd29cb561d6f48773e894dd62fe353b7f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Alexays",
+        "repo": "waybar",
+        "type": "github"
+      }
+    },
     "wlroots": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index b1e9c50..e176ea8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,10 +19,11 @@
     };
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     hyprland.url = "github:hyprwm/Hyprland";
+    waybar.url = "github:Alexays/waybar";
   };
 
   outputs = inputs@{ nixpkgs, home-manager, sops-nix, nixvim, hyprland
-    , spicetify-nix, nixos-hardware, ... }: {
+    , spicetify-nix, nixos-hardware, waybar, ... }: {
       nixosConfigurations = {
         nixy = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
@@ -43,6 +44,7 @@
                   inherit spicetify-nix;
                   inherit sops-nix;
                   inherit hyprland;
+                  inherit waybar;
                 };
               };
             }
diff --git a/home/system/waybar/default.nix b/home/system/waybar/default.nix
index d637368..dba2a35 100644
--- a/home/system/waybar/default.nix
+++ b/home/system/waybar/default.nix
@@ -1,4 +1,4 @@
-{ config, ... }: {
+{ config, pkgs, inputs, ... }: {
   services = {
     blueman-applet.enable = true;
     network-manager-applet.enable = true;
@@ -6,6 +6,7 @@
 
   programs.waybar = {
     enable = true;
+    package = inputs.waybar.packages."${pkgs.system}".waybar;
     settings = {
       mainBar = {
         layer = "top";
diff --git a/variables.nix b/variables.nix
index 41d8601..d92b890 100644
--- a/variables.nix
+++ b/variables.nix
@@ -1,5 +1,4 @@
 {
-  # CHANGEME
   hostName = "nixy";
   username = "hadi";
   homeDirectory = "/home/hadi";