From 248369d0c3dc1fbeb8d9931b8068a962f037b169 Mon Sep 17 00:00:00 2001
From: pmcc <charavel@pm.me>
Date: Thu, 27 Aug 2026 16:15:31 -0400
Subject: [PATCH] Update

---
 .chezmoitemplates/bar-primary       |  4 ++--
 .chezmoitemplates/bar-secondary     | 19 -------------------
 .chezmoitemplates/waybar-modules    | 10 +++++-----
 dot_config/waybar/config.jsonc.tmpl | 11 ++++-------
 dot_config/waybar/style.css         |  4 ----
 5 files changed, 11 insertions(+), 37 deletions(-)
 delete mode 100644 .chezmoitemplates/bar-secondary

diff --git a/.chezmoitemplates/bar-primary b/.chezmoitemplates/bar-primary
index 3e8e662..a9bd6e0 100644
--- a/.chezmoitemplates/bar-primary
+++ b/.chezmoitemplates/bar-primary
@@ -1,8 +1,8 @@
 {
   "output": "{{ .out }}",
   "layer": "top", // Waybar at top layer
-  "position": "left", // Waybar position (top|bottom|left|right)
-  "width": 44, // Waybar width
+  "position": "top", // Waybar position (top|bottom|left|right)
+  "height": 44, // Waybar height
   // Choose the order of the modules
   "modules-left": ["clock", "pulseaudio"],
   "modules-center": ["sway/workspaces"],
diff --git a/.chezmoitemplates/bar-secondary b/.chezmoitemplates/bar-secondary
deleted file mode 100644
index 132ca78..0000000
--- a/.chezmoitemplates/bar-secondary
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "output": "DP-2",
-  "layer": "top",
-  "position": "top",
-  "height": 44,
-  "modules-left": ["tray"],
-  "modules-right": ["clock"],
-  "modules-center": ["sway/workspaces"],
-  "tray": {
-    "icon-size": 21,
-    "spacing": 10
-  },
-{{ template "workspaces" (dict "out" "DP-2" "ws" (list "5" "6" "7" "8")) }}
-  "clock": {
-    "timezone": "America/Montreal",
-    "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-    "format": "🕐 {:%H:%M 📅 %d/%m/%y}"
-  }
-}
diff --git a/.chezmoitemplates/waybar-modules b/.chezmoitemplates/waybar-modules
index 9cd35ea..498c691 100644
--- a/.chezmoitemplates/waybar-modules
+++ b/.chezmoitemplates/waybar-modules
@@ -5,7 +5,7 @@
   "clock": {
     "timezone": "America/Montreal",
     "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-    "format": "🕐\n{:%H\n%M\n\n📅\n%d\n%m\n%y} "
+    "format": "🕐 {:%H:%M 📅 %d/%m/%y}"
   },
   "backlight": {
     "device": "intel_backlight",
@@ -17,9 +17,9 @@
       "warning": 30,
       "critical": 15
     },
-    "format": "🔋\n{capacity}",
-    "format-charging": "⚡\n{capacity}",
-    "format-plugged": "🔌\n{capacity}",
+    "format": "🔋 {capacity}",
+    "format-charging": "⚡ {capacity}",
+    "format-plugged": "🔌 {capacity}",
     "format-alt": "{icon}",
     "format-icons": ["", "",  "", "", "", "", "", "", "", "", "", ""]
   },
@@ -36,7 +36,7 @@
   },
   "pulseaudio": {
       // "scroll-step": 1, // %, can be a float
-    "format": "{icon}\n{volume}",
+    "format": "{icon} {volume}",
     "format-muted": "",
     "format-icons": {
       "default": ["", "", " "]
diff --git a/dot_config/waybar/config.jsonc.tmpl b/dot_config/waybar/config.jsonc.tmpl
index 565ff46..eb94077 100644
--- a/dot_config/waybar/config.jsonc.tmpl
+++ b/dot_config/waybar/config.jsonc.tmpl
@@ -1,11 +1,8 @@
 {{- if eq .chezmoi.hostname "framework13pro" -}}
-[{{ template "bar-primary" (dict "out" "eDP-1" "ws" (list "1" "2" "3" "4")) }},
-{{ template "bar-secondary" . }}]
+[{{ template "bar-primary" (dict "out" "eDP-1" "ws" (list "1" "2" "3" "4")) }}]
 {{- else if eq .chezmoi.hostname "flow" -}}
-[{{ template "bar-primary" (dict "out" "DP-1" "ws" (list "1" "2" "3" "4")) }},
-{{ template "bar-secondary" . }}]
+[{{ template "bar-primary" (dict "out" "DP-1" "ws" (list "1" "2" "3" "4")) }}]
 {{- else if eq .chezmoi.hostname "gata" -}}
-// TODO: fill in gata's outputs (run: swaymsg -t get_outputs)
-[{{ template "bar-primary" (dict "out" "DP-1" "ws" (list "1" "2" "3" "4")) }},
-{{ template "bar-secondary" . }}]
+// TODO: confirm gata's primary output (run: swaymsg -t get_outputs)
+[{{ template "bar-primary" (dict "out" "DP-1" "ws" (list "1" "2" "3" "4")) }}]
 {{- end }}
diff --git a/dot_config/waybar/style.css b/dot_config/waybar/style.css
index 223a474..8850b74 100644
--- a/dot_config/waybar/style.css
+++ b/dot_config/waybar/style.css
@@ -80,7 +80,3 @@
   background-color: @red;
   color: @crust;
 }
-
-window#waybar.left #tray {
-  padding-bottom: 2rem;
-}