diff options
Diffstat (limited to 'waybar')
| -rw-r--r-- | waybar/config | 112 | ||||
| -rw-r--r-- | waybar/style.css | 56 |
2 files changed, 136 insertions, 32 deletions
diff --git a/waybar/config b/waybar/config index 2717db9..93cbcf1 100644 --- a/waybar/config +++ b/waybar/config @@ -1,24 +1,77 @@ +// vim: set filetype=json5 : { - "layer": "top", + "layer": "bottom", "position": "top", "height": 36, //"output": "%%DISPLAY%%", "spacing": 4, //"margin-top": 5, - //"margin-bottom":5, + //"margin-bottom": 5, // Choose the order of the modules "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"], "modules-center":[], - "modules-right":[ "tray", "mpd", "idle_inhibitor", "wireplumber", "cpu", "memory", "temperature#cpu", "temperature#gpu", "backlight", "network", "clock", "custom/power"], + "modules-right":[ "tray", "mpd", "idle_inhibitor", "wireplumber", "cpu", "memory", "temperature#cpu", "temperature#gpu", "backlight", "custom/battery", "network", "clock", "custom/power"], // Modules configuration + "sway/workspaces": { + "all-outputs": false, + "persistent-workspaces": { + "11": ["eDP-1"], + "12": ["eDP-1"], + "13": ["eDP-1"], + "14": ["eDP-1"], + "15": ["eDP-1"], + "16": ["eDP-1"], + "17": ["eDP-1"], + "18": ["eDP-1"], + "19": ["eDP-1"], + }, + "format": "{icon}", + "format-icons": { + "1": "1", + "2": "2", + "3": "3", + "4": "4", + "5": "5", + "6": "6", + "7": "7", + "8": "8", + "9": "9", + "10": "0", + "11": "1", + "12": "2", + "13": "3", + "14": "4", + "15": "5", + "16": "6", + "17": "7", + "18": "8", + "19": "9", + "20": "0", + "21": "1", + "22": "2", + "23": "3", + "24": "4", + "25": "5", + "26": "6", + "27": "7", + "28": "8", + "29": "9", + }, + }, + "niri/workspaces": { + "format": "{value}", + "all-outputs": false, + "on-click": "activate" + }, "hyprland/workspaces": { "format": "{icon}", "active-only": false, "all-outputs": false, + "persistent-only": true, "format-icons": { "1": "1", "2": "2", @@ -40,15 +93,29 @@ "18": "9", }, "persistent-workspaces": { - "eDP-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], + "*": 9, }, - "on-scroll-up": "hyprctl dispatch split-workspace e+1", - "on-scroll-down": "hyprctl dispatch split-workspace e-1", + "on-scroll-up": "hyprctl dispatch split:workspace r+1", + "on-scroll-down": "hyprctl dispatch split:workspace r-1", "on-click": "activate" }, + "sway/window": { + "separate-outputs": true, + "icon": true, + "format": "{title}", + "expand": true + }, + "niri/window": { + "separate-outputs": true, + "icon": true, + "format": "{title}", + "expand": true + }, "hyprland/window": { "separate-outputs": true, - "format": "{}" + "icon": true, + "format": "{title}", + "expand": true, }, "keyboard-state": { "numlock": true, @@ -91,7 +158,7 @@ "tooltip": false }, "memory": { - "format": "{}% " + "format": "{used}G " }, "battery": { "bat": "BAT0", @@ -105,16 +172,16 @@ }, "temperature#cpu": { "thermal-zone": 0, - // "hwmon-path": "cat /sys/class/hwmon/hwmon5/temp1_input", - "critical-threshold": 110, + // "hwmon-path": "cat /sys/class/hwmon/hwmon4/temp1_input", + "critical-threshold": 90, "format-critical": "{temperatureC}°C", "format": "", "format-icons": ["", "", ""] }, "temperature#gpu": { "thermal-zone": 1, - // "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input", - "critical-threshold": 126, + // "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input", + "critical-threshold": 90, "format-critical": "{temperatureC}°C", "format": "", "format-icons": ["", "", ""] @@ -126,7 +193,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) ", @@ -144,14 +211,21 @@ "scroll-step": 0.1 }, "custom/launcher":{ - "format": "", - "on-click": "exec $(tofi-drun)", - "on-click-right": "killall tofi" + "format": ">_", + "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": "nwg-bar", - "on-click-right": "killall nwg-bar" + "format": "", + "on-click": "power-menu", + //"on-click-right": "killall rofi" }, "custom/snip":{ "format": " ", diff --git a/waybar/style.css b/waybar/style.css index 6a9d8cc..04a1c3e 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: mononoki 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.4); } window#waybar.hidden { @@ -53,7 +54,11 @@ window#waybar.hidden { */ #workspaces button.active { - background: #EC0101; + background: #198844; +} + +#workspaces button.focused { + background: #198844; } /* @@ -85,6 +90,7 @@ window#waybar.hidden { #custom-media, #custom-launcher, #custom-power, +#custom-battery, #custom-layout, #custom-updater, #custom-snip, @@ -126,7 +132,7 @@ window#waybar.hidden { } #battery.charging, #battery.plugged { - color: #EC0101; + color: #198844; background-color: #1b1d1c; } @@ -154,11 +160,13 @@ label:focus { #cpu { background-color: #1b1d1c; color: #ffffff; + padding-right: 18px; } #memory { - background-color: #EC0101; + background-color: #198844; color: #ffffff; + padding-right: 18px; } #disk { @@ -167,13 +175,14 @@ label:focus { } #backlight { - background-color: #EC0101; + background-color: #198844; color: #ffffff; } #network { - background-color: #EC0101; + background-color: #198844; color: #ffffff; + padding-right: 18px; } #network.disconnected { @@ -182,13 +191,14 @@ label:focus { } #wireplumber { - background-color: #EC0101; + background-color: #198844; color: #ffffff; + padding-right: 18px; } #wireplumber.muted { background-color: #1b1d1c; - color: #EC0101; + color: #198844; } #custom-media { @@ -211,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{ @@ -278,30 +307,31 @@ label:focus { } #tray { - background-color: transparent; + border-radius: 20px; + background-color: black; color: #ffffff; } #tray > .passive { -gtk-icon-effect: dim; - background-color: #EC0101; + background-color: #198844; color: #ffffff; } #tray > .needs-attention { -gtk-icon-effect: highlight; - background-color: #EC0101; + background-color: #198844; color: #ffffff; } #idle_inhibitor { background-color: #1b1d1c; border-radius: 20px 0px 0px 20px; - + padding-right: 18px; } #idle_inhibitor.activated { - background-color: #EC0101; + background-color: #198844; color: #ffffff; border-radius: 20px 0px 0px 20px; |