diff --git a/hyprland/.config/waybar/river/config.jsonc b/hyprland/.config/waybar/river/config.jsonc index c595f5d..7848dfa 100644 --- a/hyprland/.config/waybar/river/config.jsonc +++ b/hyprland/.config/waybar/river/config.jsonc @@ -3,26 +3,25 @@ "position": "top", "height": 30, "spacing": 5, - "margin-top": 10, - "margin-bottom": 5, - "margin-left": 5, - "margin-right": 5, + "margin-top": 8, + "margin-bottom": 4, + "margin-left": 4, + "margin-right": 4, "modules-right": [ - "hyprland/workspaces", + "wireplumber", + "clock", + "hyprland/language", "custom/power" ], "modules-left": [ - "custom/launcher", - "custom/media", - "tray" + // "custom/launcher", + "hyprland/workspaces", + "custom/media" // "wlr/taskbar" ], "modules-center": [ - "hyprland/language", - "clock", - "wireplumber", - "backlight", "battery", + "cpu", "memory", "network#network-2", "network" @@ -31,7 +30,6 @@ // "custom/updater", // "custom/wallpaper", // "pulseaudio/slider", - // "cpu", // "keyboard-state", ], "hyprland/language": { @@ -53,9 +51,8 @@ "spacing": 10 }, "clock": { - "format": "{:%H:%M} ", + "format": "{:%H : %M} ", "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%Y-%m-%d} " }, "pulseaudio": { "scroll-step": 5, @@ -85,9 +82,9 @@ "format": "{volume}% {icon}", "format-bluetooth": "{volume}% {icon}", "format-bluetooth-muted": "{icon} {format_source}", - "format-muted": "{format_source}", + "format-muted": "", "format-source": "", - "format-source-muted": "", + "format-source-muted": "", "format-icons": { "headphone": "", "hands-free": "", @@ -125,13 +122,13 @@ "3": "", "4": "", "5": "", - "6": "", + "6": "", "7": "", "8": "", "9": "" }, "persistent-workspaces": { - "*": 7 + "*": 6 } }, "keyboard-state": { @@ -151,8 +148,8 @@ } }, "cpu": { - "format": "{usage}% ", - "tooltip": true + "interval": 1, + "format": "{load:0.1f} % " }, "memory": { "format": "{used:0.1f} / {total:0.1f} GB", @@ -197,8 +194,8 @@ "tooltip": false }, "network#network-2": { - "format-wifi": " {bandwidthDownBytes}  {bandwidthUpBytes}", - "format-ethernet": " {bandwidthDownBytes}  {bandwidthUpBytes}", + "format-wifi": " : {bandwidthDownBytes}  : {bandwidthUpBytes}", + "format-ethernet": " : {bandwidthDownBytes}  : {bandwidthUpBytes}", "format-linked": "(No IP) ", "format-disconnected": " 0.0B/s  0.0B/s", "on-click-right": "~/.config/hypr/scripts/nmtui-launch.sh", diff --git a/hyprland/.config/waybar/river/style.css b/hyprland/.config/waybar/river/style.css index 1d1f5d5..2167edf 100644 --- a/hyprland/.config/waybar/river/style.css +++ b/hyprland/.config/waybar/river/style.css @@ -2,7 +2,7 @@ * { border: none; - border-radius: 5px; + border-radius: 6px; font-family: Roboto, Helvetica, Arial, sans-serif; font-size: 12px; font-weight: bold; @@ -10,7 +10,6 @@ window#waybar { background-color: transparent; - border-radius: 12px; } window#waybar.hidden { @@ -22,28 +21,24 @@ window#waybar.hidden { } #workspaces { - padding: 0px 5px; + background-color: @backgrounddark; + padding: 0px 6px; } #workspaces button { opacity: 0.2; transition: all 0.4s cubic-bezier(0.55, -0.68, 0.48, 1.682); + font-size: 12px; } #workspaces button.active { opacity: 1; - transition: all 0.5s cubic-bezier(0.55, -0.68, 0.48, 1.682); } #workspaces button:hover { opacity: 1; } -#mode { - background-color: #64727d; - border-bottom: 3px solid #ffffff; -} - #clock, #battery, #cpu, @@ -66,15 +61,10 @@ window#waybar.hidden { #mode, #idle_inhibitor, #mpd, -#workspaces, #wireplumber, #language { background-color: @backgrounddark; - padding: 0px 10px; -} - -#taskbar { - padding: 0px 4px; + padding: 0px 6px; } #taskbar button { @@ -85,15 +75,6 @@ window#waybar.hidden { opacity: 1; } -#tray>.passive { - -gtk-icon-effect: dim; - -} - -#tray>.needs-attention { - -gtk-icon-effect: highlight; -} - #battery.charging, #battery.plugged { background-color: #26a65b; @@ -114,7 +95,6 @@ window#waybar.hidden { #network { min-width: 160px; - } #network.network-2 { @@ -192,28 +172,6 @@ window#waybar.hidden { background-color: #eb4d4b; } -#idle_inhibitor { - border-radius: 20px 0px 0px 20px; -} - -#idle_inhibitor.activated { - border-radius: 20px 0px 0px 20px; -} - -#keyboard-state { - background: #97e1ad; - color: #000000; - min-width: 16px; -} - -#keyboard-state>label { - padding: 0px 5px; -} - -#keyboard-state>label.locked { - background: rgba(0, 0, 0, 0.2); -} - #pulseaudio { min-width: 55px; } @@ -224,11 +182,10 @@ window#waybar.hidden { #memory { min-width: 85px; - } -#wireplumber { - min-width: 60px; +#cpu { + min-width: 85px; } #language { @@ -236,6 +193,10 @@ window#waybar.hidden { } #clock { + min-width: 70px; +} + +#wireplumber { min-width: 60px; }