diff options
Diffstat (limited to 'waybar')
-rw-r--r-- | waybar/config | 20 | ||||
-rw-r--r-- | waybar/style.css | 29 |
2 files changed, 41 insertions, 8 deletions
diff --git a/waybar/config b/waybar/config index c6cb9f5..0f47270 100644 --- a/waybar/config +++ b/waybar/config @@ -1,3 +1,4 @@ +// vim: set filetype=json5 : { "layer": "bottom", "position": "top", @@ -9,7 +10,7 @@ // Choose the order of the modules - "modules-left":[ "sway/workspaces", "custom/launcher", "sway/window"], + "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"], "modules-center":[], "modules-right":[ "tray", "mpd", "idle_inhibitor", "temperature#cpu0", "temperature#cpu1", "temperature#gpu0", "temperature#gpu1", "temperature#gpu2", "wireplumber", "cpu", "memory", "network", "clock", "custom/power"], @@ -79,6 +80,7 @@ "format": "{icon}", "active-only": false, "all-outputs": false, + "persistent-only": true, "format-icons": { "1": "1", "2": "2", @@ -100,8 +102,7 @@ "18": "9", }, "persistent-workspaces": { - "DP-2": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], - "HDMI-A-1": [ 10, 11, 12, 13, 14, 15, 16, 17, 18 ], + "*": 9, }, "on-scroll-up": "hyprctl dispatch split:workspace r+1", "on-scroll-down": "hyprctl dispatch split:workspace r-1", @@ -166,7 +167,7 @@ "tooltip": false }, "memory": { - "format": "{}% " + "format": "{used}G " }, "battery": { "bat": "BAT0", @@ -225,7 +226,7 @@ }, "network": { // "interface": "wlp2*", // (Optional) To force the use of this interface - "format-wifi": "{essid} ({signalStrength}%) ", + "format-wifi": "{essid} ", "format-ethernet": "Connected ", "tooltip-format": "{ifname} via {gwaddr} ", "format-linked": "{ifname} (No IP) ", @@ -247,9 +248,16 @@ "on-click": "rofi -show drun", //"on-click-right": "killall rofi" }, + "custom/battery":{ + "interval": 15, + "format": "{percentage}%", + "return-type": "json", + "exec": "custom-battery", + "tooltip": true, + }, "custom/power":{ "format": "", - "on-click": "rofi -show p -modi p:rofi-power-menu", + "on-click": "power-menu", //"on-click-right": "killall rofi" }, "custom/snip":{ diff --git a/waybar/style.css b/waybar/style.css index f8fec13..7e6e851 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -3,7 +3,7 @@ margin: 0px; border-radius: 0px; /* `otf-font-awesome` is required to be installed for icons */ - font-family: FiraCode Nerd Font Mono; + font-family: JetBrainsMono Nerd Font; font-size: 18px; min-height: 0px; min-width: 0px; @@ -14,6 +14,7 @@ window#waybar { color: #ffffff; transition-property: background-color; transition-duration: .5s; + background: rgba(0, 0, 0, 0.2); } window#waybar.hidden { @@ -89,6 +90,7 @@ window#waybar.hidden { #custom-media, #custom-launcher, #custom-power, +#custom-battery, #custom-layout, #custom-updater, #custom-snip, @@ -158,11 +160,13 @@ label:focus { #cpu { background-color: #198844; color: #ffffff; + padding-right: 18px; } #memory { background-color: #1b1d1c; color: #ffffff; + padding-right: 18px; } #disk { @@ -178,6 +182,7 @@ label:focus { #network { background-color: #198844; color: #ffffff; + padding-right: 18px; } #network.disconnected { @@ -188,6 +193,7 @@ label:focus { #wireplumber { background-color: #1b1d1c; color: #ffffff; + padding-right: 18px; } #wireplumber.muted { @@ -215,7 +221,26 @@ label:focus { background-color: #1b1d1c; font-size: 18px; margin-right: 5px; +} + +#custom-battery{ + background-color: #1b1d1c; + font-size: 18px; +} +#custom-battery.battery_low{ + background-color: yellow; + color: #1b1d1c; +} + +#custom-battery.battery_crit{ + background-color: red; + color: #1b1d1c; +} + +#custom-battery.battery_charging{ + background-color: #1d1b1c; + color: #198844; } #custom-launcher{ @@ -302,7 +327,7 @@ label:focus { #idle_inhibitor { background-color: #1b1d1c; border-radius: 20px 0px 0px 20px; - + padding-right: 18px; } #idle_inhibitor.activated { |