From 86c7d6f99798bc2e0ea6a1eaef6cea3bc7156440 Mon Sep 17 00:00:00 2001
From: Dan MacLeod <dan@dmac.au>
Date: Thu, 3 Jul 2025 01:37:22 +0930
Subject: [PATCH] Updated waybar for laptop

---
 waybar/config.jsonc | 12 ++++++------
 waybar/style.css    |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index 4ef7de1..f92935d 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -1,8 +1,8 @@
 {
     "layer": "top", // Waybar at top layer
-    "output": ["eDP-1", "DP-1"], // Only display on on monitor
+    "output": ["DP-1", "eDP-1"], // Only display on on monitor
     "position": "top", // Waybar position (top|bottom|left|right)
-    "height": 36, // Waybar height (to be removed for auto height)
+    "height": 28, // Waybar height (to be removed for auto height)
     // Choose the order of the modules
     "modules-left": [
         "custom/logo",
@@ -42,7 +42,7 @@
     },
     "wlr/taskbar": {
         "active-first": true,
-        "icon-size": 24,
+        "icon-size": 20,
         "on-click": "activate",
         "on-click-middle": "close",
         "app_ids-mapping": {
@@ -59,7 +59,7 @@
         }
     },
     "tray": {
-        // "icon-size": 21,
+        "icon-size": 20,
         "spacing": 10
     },
     "clock": {
@@ -92,7 +92,7 @@
         "on-click-right": "exec wezterm -e btm"
     },
     "memory": {
-        "format": "{percentage}% / {used:0.1f}GiB ",
+        "format": "{percentage}% ",
         "on-click-right": "exec wezterm -e btm"
     },
     "temperature": {
@@ -118,7 +118,7 @@
         },
         "format": "{capacity}% {icon}",
         "format-charging": "{capacity}% 󱐋",
-        "format-plugged": "{capacity}% ",
+        "format-plugged": "",
         "format-alt": "{capacity}% {time}",
         "format-icons": ["", "", "", "", ""]
     },
diff --git a/waybar/style.css b/waybar/style.css
index b3bf182..6210ca5 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -12,6 +12,7 @@
 #waybar {
   background-color: alpha(@base, 0.7);
   /* background: transparent; */
+  margin: 0px;
 }
 
 #custom-logo {
@@ -19,7 +20,7 @@
   background-color: @base;
   background-position: center;
   background-repeat: no-repeat;
-  background-size: 24px;
+  background-size: 40%;
   padding: 0px 8px 0px 24px;
 }
 
@@ -34,7 +35,7 @@
 #custom-pl-pulse,
 #custom-pl-idle-before,
 #custom-pl-tray {
-  font-size: 26px;
+  font-size: 24px;
 }
 
 #workspaces *,
@@ -43,8 +44,8 @@
 #clock,
 #idle_inhibitor,
 #cpu,
-#battery,
 #memory,
+#battery,
 #temperature,
 #pulseaudio,
 #custom-power,