diff --git a/files/system/etc/xdg/waybar/config.jsonc b/files/system/etc/xdg/waybar/config.jsonc
new file mode 100644
index 0000000..3b2b5f5
--- /dev/null
+++ b/files/system/etc/xdg/waybar/config.jsonc
@@ -0,0 +1,106 @@
+// -*- mode: jsonc -*-
+{
+    "layer": "top", // Waybar at top layer
+    // "position": "bottom", // Waybar position (top|bottom|left|right)
+    "height": 52, // Waybar height (to be removed for auto height)
+    // "width": 1280, // Waybar width
+    "spacing": 0, // Gaps between modules (4px)
+    // Choose the order of the modules
+    "modules-left": [
+	    "cpu",
+	    "memory",
+        "custom/edit-config",
+        "hyprland/workspaces",
+        "hyprland/window"
+    ],
+    "modules-center": [
+        "mpris"
+    ],
+    "modules-right": [
+        "tray",
+        "gamemode",
+        "wireplumber",
+        "custom/notification",
+        "clock"
+    ],
+    //"reload_style_on_change": true,
+    "hyprland/window":{
+      "separate-outputs": true,
+      "hide-empty-text": true,
+    },
+    "tray": {
+        // "icon-size": 21,
+        "spacing": 10
+    },
+    "clock": {
+        // "timezone": "America/New_York",
+	      "format": "{:%I : %M %p %Y-%m-%d}",
+        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
+    },
+    "cpu": {
+        "format": "{usage}% ",
+        "tooltip": false
+    },
+    "memory": {
+        "format": "{}% "
+    },
+    "temperature": {
+        // "thermal-zone": 2,
+        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+        "critical-threshold": 80,
+        // "format-critical": "{temperatureC}°C {icon}",
+        "format": "{temperatureC}°C {icon}",
+        "format-icons": ["", "", ""]
+    },
+    "network": {
+        // "interface": "wlp2*", // (Optional) To force the use of this interface
+        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-ethernet": "{ipaddr}/{cidr} ",
+        "tooltip-format": "{ifname} via {gwaddr} ",
+        "format-linked": "{ifname} (No IP) ",
+        "format-disconnected": "Disconnected ⚠",
+        "format-alt": "{ifname}: {ipaddr}/{cidr}"
+    },
+    "wireplumber": {
+      "format": "{node_name} {volume}% {icon}",
+      "format-muted": "{node_name} ",
+      "on-click": "hyprctl dispatch -- exec flatpak run com.saivert.pwvucontrol",
+      "format-icons": ["", "", ""]
+    },
+    "custom/notification": {
+      "tooltip": false,
+      "format": "{} {icon}",
+      "format-icons": {
+        "notification": "",
+        "none": "",
+        "dnd-notification": "",
+        "dnd-none": "",
+        "inhibited-notification": "",
+        "inhibited-none": "",
+        "dnd-inhibited-notification": "",
+        "dnd-inhibited-none": ""
+      },
+      "return-type": "json",
+      "exec-if": "which swaync-client",
+      "exec": "swaync-client -swb",
+      "on-click": "swaync-client -t -sw",
+      "on-click-right": "swaync-client -d -sw",
+      "escape": true
+    },
+    "custom/edit-config": {
+      "format": "Edit",
+      "on-click": "$HOME/bin/local-lua $HOME/bin/launch-edit-configs.lua",
+      "on-click-right": "$HOME/bin/reload-waybar"
+    },
+    "mpris": {
+        "format": "{player_icon} {title} - {artist}",
+        "format-paused": "{status_icon} {title} - {artist}",
+        "player-icons": {
+            "default": "▶",
+            "mpv": "🎵"
+        },
+        "status-icons": {
+            "paused": "⏸"
+        }
+	},
+}
diff --git a/files/system/etc/xdg/waybar/style.css b/files/system/etc/xdg/waybar/style.css
new file mode 100644
index 0000000..3036a72
--- /dev/null
+++ b/files/system/etc/xdg/waybar/style.css
@@ -0,0 +1,129 @@
+@import "tokyonight.css";
+
+* {
+  font-family: JetBrains Mono;
+  font-size: 17px;
+  min-height: 0;
+}
+
+window#waybar {
+  background-color: @transparent;
+  color: @theme_text_color;
+  margin: 0rem 0rem 0rem 0rem;
+}
+
+#workspaces button {
+  color: @lavender;
+  border-radius: 1.5rem;
+  padding: 0rem 0.5rem;
+}
+
+#workspaces button.active {
+  color: @sky;
+  border-radius: 1.5rem;
+}
+
+#workspaces button:hover {
+  color: @sapphire;
+  border-radius: 1.5rem;
+}
+
+#cpu,
+#memory,
+#custom-weather,
+#wireplumber,
+#custom-notification,
+#custom-music,
+#custom-edit-config,
+#tray,
+#backlight,
+#clock,
+#battery,
+#pulseaudio,
+#custom-lock,
+#powermenu,
+#window,
+#workspaces,
+#gamemode,
+#mpris {
+  background-color: @theme_bg_color;
+  padding: 0.5rem 0.75rem;
+  margin: 0.75rem 0.25rem 0rem 0.25rem;
+  border-radius: 1.5rem;
+  border: 2px solid;
+}
+
+window#waybar.empty #window {
+    background-color: transparent;
+    border: 0px
+}
+
+/* left side margin */
+#cpu {
+    margin-left: 1rem;
+}
+
+/* right side margin */
+#clock {
+    margin-right: 1rem;
+}
+
+#cpu {
+  color: @green;
+}
+
+#memory {
+  color: @magenta;
+}
+
+#clock {
+  color: @blue;
+}
+
+#battery {
+  color: @green;
+}
+
+#battery.charging {
+  color: @green;
+}
+
+#battery.warning:not(.charging) {
+  color: @red;
+}
+
+#backlight {
+  color: @yellow;
+}
+
+#pulseaudio {
+  color: @maroon;
+}
+
+#custom-music {
+  color: @mauve;
+}
+
+#custom-lock {
+    color: @magenta;
+}
+
+#custom-power {
+    color: @red;
+}
+
+#wireplumber {
+  color: @red;
+}
+
+#custom-notification {
+  color: @rosewater;
+}
+
+#custom-notification.notification {
+  color: @red;
+}
+
+#custom-notification.dnd-notification {
+  color: @maroon;
+}
diff --git a/files/system/etc/xdg/waybar/tokyonight.css b/files/system/etc/xdg/waybar/tokyonight.css
new file mode 100644
index 0000000..4a259ee
--- /dev/null
+++ b/files/system/etc/xdg/waybar/tokyonight.css
@@ -0,0 +1,15 @@
+@define-color foreground #313244;
+@define-color background #1a1b26;
+@define-color text #a9b1d6;
+@define-color black #414868;
+@define-color red #f7768e;
+@define-color green #73daca;
+@define-color yellow #e0af68;
+@define-color blue #7aa2f7;
+@define-color magenta #bb9af7;
+@define-color cyan #7dcfff;
+@define-color white #c0caf5;
+@define-color sky #89dceb;
+@define-color sapphire #74c7ec;
+@define-color rosewater #f5e0dc;
+@define-color flamingo #f2cdcd;
\ No newline at end of file