From 188486ff0ccd3e5c4447aa8e8c34317e8bc6a481 Mon Sep 17 00:00:00 2001
From: Jacob Babor <jacob@babor.tech>
Date: Thu, 15 Feb 2024 03:48:54 -0600
Subject: [PATCH] Manipulate waybar a bit more to reach parity with my old
 polybar setup

---
 sericea/.config/sway/config      | 4 ++--
 sericea/.config/waybar/config    | 8 ++++++--
 sericea/.config/waybar/style.css | 8 +++++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/sericea/.config/sway/config b/sericea/.config/sway/config
index e7dd9777..56175c91 100644
--- a/sericea/.config/sway/config
+++ b/sericea/.config/sway/config
@@ -36,8 +36,8 @@ workspace $w9 output $monsec
 ## WINDOW RULES
 for_window {
 	[app_id="org.mozilla.firefox"]		move container to workspace $w1
-	[app_id="org.keepassxc.KeePassXC"]	move container to workspace $w7
-	[app_id="org.mozilla.Thunderbird"]	move container to workspace $w8
+	[app_id="org.mozilla.Thunderbird"]	move container to workspace $w7
+	[app_id="org.keepassxc.KeePassXC"]	move container to workspace $w8
 	[app_id="com.discordapp.Discord"]	move container to workspace $w9
 	[app_id="com.discordapp.Discord"]	inhibit_idle visible
 	[class="Element"]			move container to workspace $w9
diff --git a/sericea/.config/waybar/config b/sericea/.config/waybar/config
index 7e3b9b95..18549cb0 100644
--- a/sericea/.config/waybar/config
+++ b/sericea/.config/waybar/config
@@ -2,8 +2,8 @@
 	"layer": "top",
 	"height": 40,
 	"modules-left": ["sway/workspaces", "sway/mode"],
-	"modules-center": ["tray"],
-	"modules-right": ["mpris", "idle_inhibitor", "pulseaudio", "battery", "clock"],
+	"modules-center": ["clock"],
+	"modules-right": ["mpris", "idle_inhibitor", "pulseaudio", "backlight", "battery", "tray"],
 	"sway/workspaces": {
 		"disable-scroll": true,
 		"persistent_workspaces": {
@@ -46,6 +46,10 @@
 		"format-plugged": "{icon} {capacity}%",
 		"format-icons": ["", "", "", "", ""]
 	},
+	"backlight": {
+		"format": "{icon} {percent}%",
+		"format-icons": ["", ""]
+	},
 	"mpris": {
 		"interval": 1,
 		"format": "{player_icon}",
diff --git a/sericea/.config/waybar/style.css b/sericea/.config/waybar/style.css
index dcfa8a0e..42b6ef5a 100644
--- a/sericea/.config/waybar/style.css
+++ b/sericea/.config/waybar/style.css
@@ -48,6 +48,9 @@ window#waybar {
 	padding: 0 1em;
 	color: #ebdbb2;
 }
+#tray {
+	padding: 0 1em;
+}
 #mpris {
 	padding: 0 1em;
 }
@@ -69,6 +72,10 @@ window#waybar {
 #idle_inhibitor.activated {
 	background: #fb4934;
 }
+#backlight {
+	padding: 0 1em;
+	color: #fabd2f;
+}
 #battery {
 	padding: 0 1em;
 }
@@ -85,7 +92,6 @@ window#waybar {
 	color: #fb4934;
 }
 #clock {
-	border-left: 1px solid #32302f;
 	color: #ebdbb2;
 	padding: 0 1em;
 }