Skip to content

fix(scripts/styles): improve waybar for omarchy users #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MokatilDev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(scripts/styles): improve waybar for omarchy users #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions modules/backlight.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
"backlight": {
// "interval":
"format": "{icon} {percent}%",
"format-icons": [
"", "", "", "", "", "", "", "", ""
],
"format-icons": ["󰃞", "󰃟", "󰃠"],
"min-length": 7,
"max-length": 7,
// "align":
Expand Down
2 changes: 1 addition & 1 deletion modules/battery.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
// "align":
// "justify":
// "rotate":
// "on-click":
"on-click": "omarchy-menu power",
// "on-click-middle":
// "on-click-right":
// "on-update":
Expand Down
4 changes: 2 additions & 2 deletions modules/bluetooth.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
2 changes: 1 addition & 1 deletion modules/cpu.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/power.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/update.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/user.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"max-length": 4,
// "align":
// "justify":
// "on-click":
"on-click": "omarchy-menu",
// "on-click-middle":
// "on-click-right":
// "on-update":
Expand Down
3 changes: 2 additions & 1 deletion modules/hyprland/language.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"hyprland/language": {
// "format":
// "format-<lang>":
"format-en": " en"
"format": "󰌌 {}",
"keyboard-name": "at-translated-set-2-keyboard",
// "keyboard-name":
// "min-length":
// "max-length":
Expand Down
1 change: 1 addition & 0 deletions modules/hyprland/window.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"": "Desktop",
"kitty": "Terminal",
"zsh": "Terminal",
"ghostty" : "Terminal",
"~": "Terminal"
},
// "separate-outputs":
Expand Down
2 changes: 1 addition & 1 deletion modules/idle_inhibitor.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"max-length": 3,
// "align":
// "justify":
// "on-click":
"on-click": "omarchy-toggle-idle",
// "on-click-middle":
// "on-click-right":
// "on-update":
Expand Down
2 changes: 1 addition & 1 deletion modules/memory.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"memory": {
"interval": 10,
"format": "󰘚 {percentage}%",
"format": " {percentage}%",
"format-warning": "󰀧 {percentage}%",
"format-critical": "󰀧 {percentage}%",
// "format-icons":
Expand Down
4 changes: 2 additions & 2 deletions modules/network.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
8 changes: 4 additions & 4 deletions modules/pulseaudio.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "<b>Output Device</b>: {desc}"
Expand Down Expand Up @@ -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": "<b>Input Device</b>: {desc}"
Expand Down
10 changes: 8 additions & 2 deletions modules/temperature.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
14 changes: 7 additions & 7 deletions style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,32 @@
@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;
color: @hover-fg;
}

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;
}
14 changes: 7 additions & 7 deletions styles/fonts.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
9 changes: 5 additions & 4 deletions styles/modules-center.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

#keyboard-state label,
#language {
margin-right: 12px;
margin-right: 8px;
margin-left: 8px;
color: @hover-fg;
}

Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions styles/modules-left.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
color: @workspaces;
}
#workspaces {
padding: 0 1px;
padding: 0 2px;
background-color: @workspaces;
}
#workspaces button.active label,
Expand All @@ -20,5 +20,5 @@
------------------*/

#window {
margin: 0 12px;
margin: 0 5px;
}
2 changes: 1 addition & 1 deletion styles/modules-right.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

#custom-power {
border-radius: 16px;
padding: 0 19px 0 16px;
padding: 0 12px 0 12px;
color: @accent;
}
#custom-power:hover {
Expand Down