From 5b69c58db8c899af0577351f94180ee0ed5db27b Mon Sep 17 00:00:00 2001 From: Mokatil Dev Date: Sat, 30 May 2026 21:04:44 +0100 Subject: [PATCH] fix(scripts/styles): improve waybar for omarchy users --- modules/backlight.jsonc | 4 +--- modules/battery.jsonc | 2 +- modules/bluetooth.jsonc | 4 ++-- modules/cpu.jsonc | 2 +- modules/custom/power.jsonc | 2 +- modules/custom/update.jsonc | 2 +- modules/custom/user.jsonc | 2 +- modules/hyprland/language.jsonc | 3 ++- modules/hyprland/window.jsonc | 1 + modules/idle_inhibitor.jsonc | 2 +- modules/memory.jsonc | 2 +- modules/network.jsonc | 4 ++-- modules/pulseaudio.jsonc | 8 ++++---- modules/temperature.jsonc | 10 ++++++++-- style.css | 14 +++++++------- styles/fonts.css | 14 +++++++------- styles/modules-center.css | 9 +++++---- styles/modules-left.css | 4 ++-- styles/modules-right.css | 2 +- 19 files changed, 49 insertions(+), 42 deletions(-) diff --git a/modules/backlight.jsonc b/modules/backlight.jsonc index 54b358d..08e9f6c 100644 --- a/modules/backlight.jsonc +++ b/modules/backlight.jsonc @@ -2,9 +2,7 @@ "backlight": { // "interval": "format": "{icon} {percent}%", - "format-icons": [ - "", "", "", "", "", "", "", "", "" - ], + "format-icons": ["󰃞", "󰃟", "󰃠"], "min-length": 7, "max-length": 7, // "align": diff --git a/modules/battery.jsonc b/modules/battery.jsonc index 19efa41..8e3b142 100644 --- a/modules/battery.jsonc +++ b/modules/battery.jsonc @@ -20,7 +20,7 @@ // "align": // "justify": // "rotate": - // "on-click": + "on-click": "omarchy-menu power", // "on-click-middle": // "on-click-right": // "on-update": diff --git a/modules/bluetooth.jsonc b/modules/bluetooth.jsonc index 5e505ec..0a9b360 100644 --- a/modules/bluetooth.jsonc +++ b/modules/bluetooth.jsonc @@ -15,9 +15,9 @@ "max-length": 2, // "align": // "justify": - "on-click": "kitty -e ~/.config/waybar/scripts/bluetooth", + "on-click": "omarchy-launch-bluetooth", // "on-click-middle": - "on-click-right": "~/.config/waybar/scripts/bluetooth off", + // "on-click-right", // "on-scroll-up": // "on-scroll-down": // "smooth-scrolling-threshold": diff --git a/modules/cpu.jsonc b/modules/cpu.jsonc index 67ac8a5..bfe963f 100644 --- a/modules/cpu.jsonc +++ b/modules/cpu.jsonc @@ -14,7 +14,7 @@ "warning": 75, "critical": 90 }, - // "on-click": + "on-click": "omarchy-launch-or-focus-tui btop", // "on-click-middle": // "on-click-right": // "on-update": diff --git a/modules/custom/power.jsonc b/modules/custom/power.jsonc index 821de53..c72eb94 100644 --- a/modules/custom/power.jsonc +++ b/modules/custom/power.jsonc @@ -15,7 +15,7 @@ // "max-length": // "align": // "justify": - "on-click": "kitty -e ~/.config/waybar/scripts/power", + "on-click": "omarchy-menu system", // "on-click-middle": // "on-click-right": // "on-update": diff --git a/modules/custom/update.jsonc b/modules/custom/update.jsonc index 8dd2a49..46c17b9 100644 --- a/modules/custom/update.jsonc +++ b/modules/custom/update.jsonc @@ -15,7 +15,7 @@ // "justify": "min-length": 2, "max-length": 2, - "on-click": "kitty -e ~/.config/waybar/scripts/update", + "on-click": "~/.config/waybar/scripts/update", // "on-click-middle": "on-click-right": "pkill -RTMIN+1 waybar" // "on-update": diff --git a/modules/custom/user.jsonc b/modules/custom/user.jsonc index 7d42959..1ebd9ea 100644 --- a/modules/custom/user.jsonc +++ b/modules/custom/user.jsonc @@ -15,7 +15,7 @@ "max-length": 4, // "align": // "justify": - // "on-click": + "on-click": "omarchy-menu", // "on-click-middle": // "on-click-right": // "on-update": diff --git a/modules/hyprland/language.jsonc b/modules/hyprland/language.jsonc index 9d63585..9741129 100644 --- a/modules/hyprland/language.jsonc +++ b/modules/hyprland/language.jsonc @@ -2,7 +2,8 @@ "hyprland/language": { // "format": // "format-": - "format-en": " en" + "format": "󰌌 {}", + "keyboard-name": "at-translated-set-2-keyboard", // "keyboard-name": // "min-length": // "max-length": diff --git a/modules/hyprland/window.jsonc b/modules/hyprland/window.jsonc index caca1cd..fe09c2d 100644 --- a/modules/hyprland/window.jsonc +++ b/modules/hyprland/window.jsonc @@ -5,6 +5,7 @@ "": "Desktop", "kitty": "Terminal", "zsh": "Terminal", + "ghostty" : "Terminal", "~": "Terminal" }, // "separate-outputs": diff --git a/modules/idle_inhibitor.jsonc b/modules/idle_inhibitor.jsonc index c05e5a2..3c65bd5 100644 --- a/modules/idle_inhibitor.jsonc +++ b/modules/idle_inhibitor.jsonc @@ -10,7 +10,7 @@ "max-length": 3, // "align": // "justify": - // "on-click": + "on-click": "omarchy-toggle-idle", // "on-click-middle": // "on-click-right": // "on-update": diff --git a/modules/memory.jsonc b/modules/memory.jsonc index 825a7c4..c2c6eb0 100644 --- a/modules/memory.jsonc +++ b/modules/memory.jsonc @@ -1,7 +1,7 @@ { "memory": { "interval": 10, - "format": "󰘚 {percentage}%", + "format": " {percentage}%", "format-warning": "󰀧 {percentage}%", "format-critical": "󰀧 {percentage}%", // "format-icons": diff --git a/modules/network.jsonc b/modules/network.jsonc index 05a4145..adf9710 100644 --- a/modules/network.jsonc +++ b/modules/network.jsonc @@ -19,9 +19,9 @@ "max-length": 2, // "align": // "justify": - "on-click": "kitty -e ~/.config/waybar/scripts/network", + "on-click": "omarchy-launch-wifi", // "on-click-middle": - "on-click-right": "~/.config/waybar/scripts/network off", + // "on-click-right":, // "on-update": // "on-scroll-up": // "on-scroll-down": diff --git a/modules/pulseaudio.jsonc b/modules/pulseaudio.jsonc index b0b0701..1b9108b 100644 --- a/modules/pulseaudio.jsonc +++ b/modules/pulseaudio.jsonc @@ -42,8 +42,8 @@ // "on-click-middle": // "on-click-right": // "on-update": - "on-scroll-up": "~/.config/waybar/scripts/volume output raise", - "on-scroll-down": "~/.config/waybar/scripts/volume output lower", + "on-scroll-up": "~/.config/waybar/scripts/volume output raise 5", + "on-scroll-down": "~/.config/waybar/scripts/volume output lower 5", // "smooth-scrolling-threshold": // "tooltip": "tooltip-format": "Output Device: {desc}" @@ -79,8 +79,8 @@ // "on-click-middle": // "on-click-right": // "on-update": - "on-scroll-up": "~/.config/waybar/scripts/volume input raise", - "on-scroll-down": "~/.config/waybar/scripts/volume input lower", + "on-scroll-up": "~/.config/waybar/scripts/volume input raise 5", + "on-scroll-down": "~/.config/waybar/scripts/volume input lower 5", // "smooth-scrolling-threshold": // "tooltip": "tooltip-format": "Input Device: {desc}" diff --git a/modules/temperature.jsonc b/modules/temperature.jsonc index 91bd61f..1773a70 100644 --- a/modules/temperature.jsonc +++ b/modules/temperature.jsonc @@ -1,8 +1,14 @@ { "temperature": { "thermal-zone": 1, - // "hwmon-path": - // "hwmon-path-abs": + "hwmon-path": [ + "/sys/class/hwmon/hwmon0/temp1_input", + "/sys/class/hwmon/hwmon1/temp1_input", + "/sys/class/hwmon/hwmon2/temp1_input", + "/sys/class/hwmon/hwmon3/temp1_input", + "/sys/class/hwmon/hwmon4/temp1_input", + "/sys/class/hwmon/hwmon5/temp1_input" + ], // "input-filename": // "warning-threshold": "critical-threshold": 90, diff --git a/style.css b/style.css index eb854ba..c9ab862 100644 --- a/style.css +++ b/style.css @@ -12,21 +12,21 @@ @import "styles/states.css"; .module { - margin-bottom: -1px; + margin-bottom: 2px; } #waybar { background-color: @outline; } #waybar > box { - margin: 4px; + margin: 2px; background-color: @main-bg; } button { - border-radius: 16px; - min-width: 16px; - padding: 0 10px; + border-radius: 14px; + min-width: 5px; + padding: 0 8px; } button:hover { background-color: @hover-bg; @@ -34,10 +34,10 @@ button:hover { } tooltip { - border: 2px solid @main-br; + border: 1px solid @main-br; border-radius: 10px; background-color: @main-bg; } tooltip > box { - padding: 0 6px; + padding: 0 5px; } diff --git a/styles/fonts.css b/styles/fonts.css index 74d57c2..07a612f 100644 --- a/styles/fonts.css +++ b/styles/fonts.css @@ -1,28 +1,28 @@ * { - font-family: "CommitMono Nerd Font"; - font-weight: bold; - font-size: 16px; + font-family: "JetBrainsMono Nerd Font"; + font-weight: bold; + font-size: 12px; } #window label, #mpris, tooltip label { - font-weight: normal; + font-weight: normal; } #workspaces button.active label, #workspaces button.focused label, #custom-distro { - font-size: 20px; + font-size: 12px; } #custom-power { - font-size: 18px; + font-size: 12px; } #custom-left_div, #custom-left_inv, #custom-right_div, #custom-right_inv { - font-size: 22px; + font-size: 13px; } diff --git a/styles/modules-center.css b/styles/modules-center.css index b2c04cf..f99660a 100644 --- a/styles/modules-center.css +++ b/styles/modules-center.css @@ -4,7 +4,8 @@ #keyboard-state label, #language { - margin-right: 12px; + margin-right: 8px; + margin-left: 8px; color: @hover-fg; } @@ -103,15 +104,15 @@ #network { background-color: @tray; - padding: 0 6px 0 4px; + padding: 0 6px 0 2px; } #bluetooth { background-color: @tray; - padding: 0 5px; + padding: 0 2px; } #custom-update { background-color: @tray; - padding: 0 8px 0 2px; + padding: 0 6px 0 2px; } #custom-right_div.5 { color: @tray; diff --git a/styles/modules-left.css b/styles/modules-left.css index 40789a2..5b57e20 100644 --- a/styles/modules-left.css +++ b/styles/modules-left.css @@ -7,7 +7,7 @@ color: @workspaces; } #workspaces { - padding: 0 1px; + padding: 0 2px; background-color: @workspaces; } #workspaces button.active label, @@ -20,5 +20,5 @@ ------------------*/ #window { - margin: 0 12px; + margin: 0 5px; } diff --git a/styles/modules-right.css b/styles/modules-right.css index 67779bc..c629f0b 100644 --- a/styles/modules-right.css +++ b/styles/modules-right.css @@ -51,7 +51,7 @@ #custom-power { border-radius: 16px; - padding: 0 19px 0 16px; + padding: 0 12px 0 12px; color: @accent; } #custom-power:hover {