From 9b5640be567889039c33d0c0327e98988d2c1479 Mon Sep 17 00:00:00 2001 From: zachir Date: Tue, 23 May 2023 13:35:38 -0500 Subject: waybar use only Hyprland config as config --- waybar/config | 24 ++++++-- waybar/config-Hyprland | 148 ------------------------------------------------- waybar/config-river | 140 ---------------------------------------------- 3 files changed, 18 insertions(+), 294 deletions(-) delete mode 100644 waybar/config-Hyprland delete mode 100644 waybar/config-river diff --git a/waybar/config b/waybar/config index e17ac9a..a90a0e9 100644 --- a/waybar/config +++ b/waybar/config @@ -2,19 +2,31 @@ "layer": "top", "position": "top", "height": 36, - "output": "%%DISPLAY%%", + //"output": "%%DISPLAY%%", "spacing": 4, //"margin-top": 5, //"margin-bottom":5, // Choose the order of the modules - "modules-left":[ "custom/launcher"], + "modules-left":[ "wlr/workspaces", "custom/launcher", "hyprland/window"], "modules-center":[], "modules-right":[ "mpd", "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature", "backlight", "battery#bat0", "battery#bat1", "network", "clock", "tray", "custom/power"], // Modules configuration + "wlr/workspaces": { + "format": "{name}", + "active-only": false, + "all-outputs": true, + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1", + "on-click": "activate" + }, + "hyprland/window": { + "separate-outputs": true, + "format": "{}" + }, "keyboard-state": { "numlock": true, "capslock": true, @@ -25,14 +37,14 @@ } }, "mpd": { - "format": "{artist}-{title}", + "format": "{artist} - {title}", "format-stopped": "", - "format-paused": "{artist}-{title}", + "format-paused": "{artist} - {title}", "format-disconnected": "", "artist-len": 15, "title-len": 15, //"album-len": 15, - //"max-length": 30, + //"max-length": 200, "on-click": "mpc toggle" }, "idle_inhibitor": { @@ -63,7 +75,7 @@ // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", "critical-threshold": 80, // "format-critical": "{temperatureC}°C {icon}", - "format": "{temperatureC}°C {icon}", + "format": "{temperatureC}°C", "format-icons": ["", "", ""] }, "backlight": { diff --git a/waybar/config-Hyprland b/waybar/config-Hyprland deleted file mode 100644 index 8325c86..0000000 --- a/waybar/config-Hyprland +++ /dev/null @@ -1,148 +0,0 @@ -{ - "layer": "top", - "position": "top", - "height": 36, - //"output": "%%DISPLAY%%", - "spacing": 4, - //"margin-top": 5, - //"margin-bottom":5, - - // Choose the order of the modules - - "modules-left":[ "wlr/workspaces", "custom/launcher", "hyprland/window"], - "modules-center":[], - "modules-right":[ "mpd", "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature", "backlight", "battery#bat0", "battery#bat1", "network", "clock", "tray", "custom/power"], - - // Modules configuration - - "wlr/workspaces": { - "format": "{name}", - "active-only": false, - "all-outputs": true, - "on-scroll-up": "hyprctl dispatch workspace e+1", - "on-scroll-down": "hyprctl dispatch workspace e-1" - }, - "hyprland/window": { - "separate-outputs": true, - "format": "{}" - }, - "keyboard-state": { - "numlock": true, - "capslock": true, - "format": " {name} {icon}", - "format-icons": { - "locked": "", - "unlocked": "" - } - }, - "mpd": { - "format": "{artist} - {title}", - "format-stopped": "", - "format-paused": "{artist} - {title}", - "format-disconnected": "", - "artist-len": 15, - "title-len": 15, - //"album-len": 15, - //"max-length": 200, - "on-click": "mpc toggle" - }, - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" - } - }, - "tray": { - "icon-size": 20, - "spacing": 10 - }, - "clock": { - // "timezone": "America/New_York", - "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%Y-%m-%d}" - }, - "cpu": { - "format": "{usage}% ", - "tooltip": false - }, - "memory": { - "format": "{}% " - }, - "temperature": { - // "thermal-zone": 2, - // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", - "critical-threshold": 80, - // "format-critical": "{temperatureC}°C {icon}", - "format": "{temperatureC}°C", - "format-icons": ["", "", ""] - }, - "backlight": { - // "device": "acpi_video1", - "format": "{percent}% {icon}", - "format-icons": ["", ""] - }, - "battery": { - "states": { - // "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{capacity}%", - "format-charging": "{capacity}% +", - "format-plugged": "{capacity}% =", - "format-alt": "{time}", - // "format-good": "", // An empty format will hide the module - // "format-full": "", - //"format-icons": ["", "", "", "", ""] - }, - "battery#bat0": { - "bat": "BAT0" - }, - "battery#bat1": { - "bat": "BAT1" - }, - "network": { - // "interface": "wlp2*", // (Optional) To force the use of this interface - "format-wifi": "{essid} ({signalStrength}%) ", - "format-ethernet": "Connected  ", - "tooltip-format": "{ifname} via {gwaddr} ", - "format-linked": "{ifname} (No IP) ", - "format-disconnected": "Disconnected ⚠", - "format-alt": "{ifname}: {ipaddr}/{cidr}", - "on-click-right": "bash ~/.config/rofi/wifi_menu/rofi_wifi_menu" - }, - "pulseaudio": { - // "scroll-step": 1, // %, can be a float - "format": "{volume}% {icon}", - "format-bluetooth": "{volume}% {icon}", - "format-bluetooth-muted": "{icon} {format_source}", - "format-muted": "{format_source}", - "format-source": "", - "format-source-muted": "", - "format-icons": { - "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", "", ""] - }, - "on-click": "pavucontrol" - }, - "custom/launcher":{ - "format": "", - "on-click": "exec $(tofi-drun)", - "on-click-right": "killall tofi" - }, - "custom/power":{ - "format": " ", - "on-click": "nwg-bar", - "on-click-right": "killall nwg-bar" - }, - "custom/snip":{ - "format": " ", - "on-click": "grimshot --notify save area $HOME/Pictures/$(zenity --entry --text 'Set filename:' --entry-text '.png')" - } -} diff --git a/waybar/config-river b/waybar/config-river deleted file mode 100644 index 6dfbd36..0000000 --- a/waybar/config-river +++ /dev/null @@ -1,140 +0,0 @@ -{ - "layer": "top", - "position": "top", - "OUTPUT": "%%DISPLAY%%", - "height": 36, - "spacing": 4, - //"margin-top": 5, - //"margin-bottom":5, - - // Choose the order of the modules - - "modules-left":[ "river/tags", "custom/launcher"], - "modules-center":[], - "modules-right":[ "mpd", "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature", "backlight", "battery#bat0", "battery#bat1", "network", "clock", "tray", "custom/power"], - - // Modules configuration - - "river/tags": { - "num-tags": 9, - }, - "keyboard-state": { - "numlock": true, - "capslock": true, - "format": " {name} {icon}", - "format-icons": { - "locked": "", - "unlocked": "" - } - }, - "mpd": { - "format": "{artist}-{title}", - "format-stopped": "", - "format-paused": "{artist}-{title}", - "format-disconnected": "", - "artist-len": 15, - "title-len": 15, - //"album-len": 15, - //"max-length": 30, - "on-click": "mpc toggle" - }, - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" - } - }, - "tray": { - "icon-size": 20, - "spacing": 10 - }, - "clock": { - // "timezone": "America/New_York", - "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%Y-%m-%d}" - }, - "cpu": { - "format": "{usage}% ", - "tooltip": false - }, - "memory": { - "format": "{}% " - }, - "temperature": { - // "thermal-zone": 2, - // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", - "critical-threshold": 80, - // "format-critical": "{temperatureC}°C {icon}", - "format": "{temperatureC}°C {icon}", - "format-icons": ["", "", ""] - }, - "backlight": { - // "device": "acpi_video1", - "format": "{percent}% {icon}", - "format-icons": ["", ""] - }, - "battery": { - "states": { - // "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{capacity}%", - "format-charging": "{capacity}% +", - "format-plugged": "{capacity}% =", - "format-alt": "{time}", - // "format-good": "", // An empty format will hide the module - // "format-full": "", - //"format-icons": ["", "", "", "", ""] - }, - "battery#bat0": { - "bat": "BAT0" - }, - "battery#bat1": { - "bat": "BAT1" - }, - "network": { - // "interface": "wlp2*", // (Optional) To force the use of this interface - "format-wifi": "{essid} ({signalStrength}%) ", - "format-ethernet": "Connected  ", - "tooltip-format": "{ifname} via {gwaddr} ", - "format-linked": "{ifname} (No IP) ", - "format-disconnected": "Disconnected ⚠", - "format-alt": "{ifname}: {ipaddr}/{cidr}", - "on-click-right": "bash ~/.config/rofi/wifi_menu/rofi_wifi_menu" - }, - "pulseaudio": { - // "scroll-step": 1, // %, can be a float - "format": "{volume}% {icon}", - "format-bluetooth": "{volume}% {icon}", - "format-bluetooth-muted": "{icon} {format_source}", - "format-muted": "{format_source}", - "format-source": "", - "format-source-muted": "", - "format-icons": { - "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", "", ""] - }, - "on-click": "pavucontrol" - }, - "custom/launcher":{ - "format": "", - "on-click": "exec $(tofi-drun)", - "on-click-right": "killall tofi" - }, - "custom/power":{ - "format": " ", - "on-click": "nwg-bar", - "on-click-right": "killall nwg-bar" - }, - "custom/snip":{ - "format": " ", - "on-click": "grimshot --notify save area $HOME/Pictures/$(zenity --entry --text 'Set filename:' --entry-text '.png')" - } -} -- cgit v1.2.3