diff --git a/home/default.nix b/home/default.nix
index d4df72f..ab82c87 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,6 +1,6 @@
 { system, pkgs, home-manager, modules, nid, ... }:
 let
-  ivand-programs = with modules.home.programs; [ nvim zsh tmux git chromium firefox kitty lf obs-studio sway swaylock browserpass bottom gpg comma nushell ];
+  ivand-programs = with modules.home.programs; [ nvim zsh tmux git chromium firefox kitty lf obs-studio sway swaylock browserpass bottom gpg comma nushell waybar ];
   ivand-packages = with modules.home.packages; [ dev essential media ];
 in
 {
diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix
index fff7883..da6082b 100644
--- a/modules/home/programs/default.nix
+++ b/modules/home/programs/default.nix
@@ -17,5 +17,6 @@
   sway = import ./sway { inherit pkgs; };
   swaylock = import ./swaylock;
   tmux = import ./tmux { inherit pkgs; };
+  waybar = import ./waybar { inherit pkgs; };
   zsh = import ./zsh { inherit pkgs; };
 }
diff --git a/modules/home/programs/sway/config b/modules/home/programs/sway/config
index d9a592e..c4ed630 100644
--- a/modules/home/programs/sway/config
+++ b/modules/home/programs/sway/config
@@ -6,6 +6,7 @@ set $right l
 set $term kitty
 set $menu bemenu-run | xargs swaymsg exec --
 
+exec waybar
 exec swaymsg "workspace 1; exec kitty"
 exec swaymsg "workspace 2; exec firefox"
 
@@ -107,25 +108,6 @@ bindsym $mod+Shift+minus move scratchpad
 # If there are multiple scratchpad windows, this command cycles through them.
 bindsym $mod+minus scratchpad show
 
-#
-# Status Bar:
-#
-# Read `man 5 sway-bar` for more information about this section.
-bar {
-    position top
-
-    # When the status_command prints a new line to stdout, swaybar updates.
-    # The default just shows the current date and time.
-    status_command while date +'%a %Y-%m-%d %T'; do sleep 1; done
-
-    colors {
-        statusline #ffffff
-        background #323232
-        inactive_workspace #32323200 #32323200 #5c5c5c
-        focused_workspace #a6e3a1 #a6e3a1 #000000
-    }
-}
-
 #
 # Window styles:
 #
diff --git a/modules/home/programs/waybar/default.nix b/modules/home/programs/waybar/default.nix
new file mode 100644
index 0000000..38ea2fc
--- /dev/null
+++ b/modules/home/programs/waybar/default.nix
@@ -0,0 +1,23 @@
+{ pkgs, ... }: {
+  programs.waybar = {
+    enable = true;
+    settings = {
+      mainBar = {
+        layer = "top";
+        position = "top";
+        height = 30;
+        output = [
+          "eDP-1"
+          "HDMI-A-1"
+        ];
+        modules-left = [ "sway/workspaces" ];
+        modules-right = [ "battery" "temperature" "clock" ];
+
+        "sway/workspaces" = {
+          disable-scroll = true;
+          all-outputs = true;
+        };
+      };
+    };
+  };
+}