diff --git a/module/Sway.nix b/module/Sway.nix
index 4214d26..b395183 100644
--- a/module/Sway.nix
+++ b/module/Sway.nix
@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... } @args: with lib; let
+{ lib, config, pkgs, ... }: with lib; let
 	cfg = config.module.desktop.sway;
 in {
 	options = {
@@ -14,6 +14,7 @@ in {
 				brightness.enable = true;
 				portal.enable     = true;
 				sound.enable      = true;
+				waybar.enable     = true;
 				wayland.enable    = true;
 			};
 			realtime.enable = true;
@@ -22,7 +23,6 @@ in {
 		services.gnome.gnome-keyring.enable       = mkForce false;
 		environment.variables.XDG_CURRENT_DESKTOP = "sway";
 
-		programs.waybar.enable = true;
 		programs.sway = {
 			enable = true;
 			wrapperFeatures = {
diff --git a/module/Waybar.nix b/module/Waybar.nix
new file mode 100644
index 0000000..100f2f5
--- /dev/null
+++ b/module/Waybar.nix
@@ -0,0 +1,17 @@
+{ lib, config, ... }: with lib; let
+	cfg = config.module.desktop.waybar;
+in {
+	options = {
+		module.desktop.waybar = {
+			enable = mkEnableOption "Use Waybar.";
+		};
+	};
+
+	config = mkIf cfg.enable {
+		programs.waybar.enable = true;
+
+		# Do not start automatically ffs.
+		systemd.user.services.waybar.enable = lib.mkForce false;
+	};
+}
+