diff --git a/modules/wm/niri/config/config.kdl b/modules/wm/niri/config/config.kdl
index be2acfd..699fe9e 100644
--- a/modules/wm/niri/config/config.kdl
+++ b/modules/wm/niri/config/config.kdl
@@ -177,10 +177,10 @@ layout {
 }
 
 // STARTUP
+spawn-at-startup "waybar"
 spawn-at-startup "swaync"
 spawn-at-startup "swww-daemon"
 spawn-at-startup "tailscale systray"
-spawn-at-startup "waybar &"
 spawn-sh-at-startup "~/.config/awww/bin/random-bg.sh ~/Pictures/Wallpapers/safe/dark"
 
 hotkey-overlay {
diff --git a/modules/wm/waybar/config/config.jsonc b/modules/wm/waybar/config/config.jsonc
index 732037b..f1d140e 100644
--- a/modules/wm/waybar/config/config.jsonc
+++ b/modules/wm/waybar/config/config.jsonc
@@ -2,6 +2,7 @@
   // Bar Options
   "output": "DP-3",
   "position": "left",
+  "width": 36,
   "margin-left": 8,
   "margin-top": 8,
   "margin-bottom": 8,
diff --git a/modules/wm/waybar/default.nix b/modules/wm/waybar/default.nix
index cee2cf2..698ff0b 100644
--- a/modules/wm/waybar/default.nix
+++ b/modules/wm/waybar/default.nix
@@ -5,5 +5,11 @@
     source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dev/nix-config/modules/wm/waybar/config";
   };
 
-  programs.waybar.enable = true;
+  programs.waybar = {
+    enable = true;
+    systemd = {
+      enable = true;
+      target = "graphical.target";
+    };
+  };
 }