From a0ec6493d68afb247e67fdd0fd08517396f5aba4 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 15 Nov 2023 19:05:46 +0900 Subject: [PATCH] just some small cleanup --- config/waybar/configs/Camellia | 268 +++++++++++++--------------- config/waybar/configs/Chrysanthemum | 137 +++++++------- config/waybar/configs/Gardenia | 129 +++++++------ config/waybar/configs/Peony | 214 +++++++++++----------- 4 files changed, 363 insertions(+), 385 deletions(-) diff --git a/config/waybar/configs/Camellia b/config/waybar/configs/Camellia index 7080945..aa5a41a 100644 --- a/config/waybar/configs/Camellia +++ b/config/waybar/configs/Camellia @@ -6,44 +6,43 @@ { - "include": "~/.config/waybar/modules", - "layer": "top", - //"mode": "dock", - "exclusive": true, - "passthrough": false, - "position": "bottom", - "spacing": 0, - "fixed-center": false, - "ipc": true, - "margin-top": 0, - "margin-bottom": 0, - "margin-left": 0, - "margin-right": 0, +"include": "~/.config/waybar/modules", +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "bottom", +"spacing": 0, +"fixed-center": false, +"ipc": true, +//"margin-top": 0, +"margin-bottom": 0, +"margin-left": 0, +"margin-right": 0, - "modules-left": ["hyprland/workspaces#cam","custom/separator#line","tray#cam", "wlr/taskbar"], +"modules-left": ["hyprland/workspaces#cam","custom/separator#line","tray#cam", "wlr/taskbar"], - "modules-center": ["hyprland/window#cam"], +"modules-center": ["hyprland/window#cam"], - "modules-right": ["custom/backlight","backlight/slider","custom/speaker","pulseaudio/slider","battery#cam","clock#cam", "network#cam"], - - // M O D U L E S // - - - "hyprland/workspaces#cam": { - "active-only":false, - "all-outputs": true, - "format": "{icon}", - "show-special": false, - "on-click": "activate", - "on-scroll-up": "hyprctl dispatch workspace e+1", - "on-scroll-down": "hyprctl dispatch workspace e-1", - "persistent_workspaces":{ - "1": [], - "2": [], - "3": [], - "4": [], - "5": [] - }, +"modules-right": ["custom/backlight","backlight/slider","custom/speaker","pulseaudio/slider","battery#cam","clock#cam", "network#cam"], + +// M O D U L E S // + +"hyprland/workspaces#cam": { + "active-only":false, + "all-outputs": true, + "format": "{icon}", + "show-special": false, + "on-click": "activate", + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1", + "persistent_workspaces":{ + "1": [], + "2": [], + "3": [], + "4": [], + "5": [] + }, "format-icons": { "1": "Uno", "2": "Due", @@ -55,103 +54,102 @@ "8":"Otto", "9":"Nove", "10":"Dieci" - } - }, - - "hyprland/window#cam": { - "format": " {title}", - "max-length": 50, - "rewrite": { - "(.*) — Mozilla Firefox": " $1", - "(.*) - fish": "> [$1]" - }, + } +}, + +"hyprland/window#cam": { + "format": " {title}", + "max-length": 50, + "rewrite": { + "(.*) — Mozilla Firefox": " $1", + "(.*) - zsh": "> [$1]" +}, "separate-outputs": true - }, - - "clock#cam": { - "interval": 60, - "format": "{:%A, %H:%M %p}", - "max-length": 25, - - }, - - - "battery#cam": { - "interval": 60, - "align": 0, - "rotate": 0, - //"bat": "BAT1", - //"adapter": "ACAD", - "full-at": 100, - "design-capacity": false, - "states": { - "critical": 15 - }, - "format": "{capacity}% {icon}", - "format-charging": " {capacity}%", - "format-plugged": "󱘖 {capacity}%", - "format-full": "{icon} Full", - "format-alt": "{icon} {time}", - "format-icons": ["", "", "", "", ""], - "format-time": "{H}h {M}min", - "tooltip": true, - "tooltip-format": "{timeTo} {power}w" - }, +}, - "pulseaudio/slider": { - "min": 0, - "max": 100, - "orientation": "horizontal" +"clock#cam": { + "interval": 60, + "format": "{:%A, %H:%M %p}", + "max-length": 25, - }, - - "custom/speaker": { - "exec": "echo '🔊'", - "interval": 1, - "format": "{}" - }, - - "backlight/slider": { - "min": 0, - "max": 100, - "orientation": "horizontal", - "device": "intel_backlight" - }, - - "custom/backlight": { - "exec": "echo '✨'", - "interval": 1, - "format": "{}" - }, - - "tray#cam": { - "icon-size": 16, - "spacing": 10 - }, - - "network#cam": { - "format": "{ifname}", - "format-wifi": "{icon}", - "format-ethernet": "󰌘", - "format-disconnected": "󰌙", - "tooltip-format": "{ipaddr}  {bandwidthUpBytes}  {bandwidthDownBytes}", - "format-linked": "󰈁 {ifname} (No IP)", - "tooltip-format-wifi": "{essid} {icon} {signalStrength}%", - "tooltip-format-ethernet": "{ifname} 󰌘", - "tooltip-format-disconnected": "󰌙 Disconnected", - "max-length": 50, - "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"] - }, - - "wlr/taskbar": { - "format": "{icon}", - "icon-size": 14, - "icon-theme": "Numix-Circle", - "tooltip-format": "{title}", - "on-click": "activate", - "on-click-middle": "close", - "ignore-list": [ - "Alacritty" +}, + +"battery#cam": { + "interval": 60, + "align": 0, + "rotate": 0, + //"bat": "BAT1", + //"adapter": "ACAD", + "full-at": 100, + "design-capacity": false, + "states": { + "critical": 15 + }, + "format": "{capacity}% {icon}", + "format-charging": " {capacity}%", + "format-plugged": "󱘖 {capacity}%", + "format-full": "{icon} Full", + "format-alt": "{icon} {time}", + "format-icons": ["", "", "", "", ""], + "format-time": "{H}h {M}min", + "tooltip": true, + "tooltip-format": "{timeTo} {power}w" +}, + +"pulseaudio/slider": { + "min": 0, + "max": 100, + "orientation": "horizontal" + +}, + +"custom/speaker": { + "exec": "echo '🔊'", + "interval": 1, + "format": "{}" +}, + +"backlight/slider": { + "min": 0, + "max": 100, + "orientation": "horizontal", + "device": "intel_backlight" +}, + +"custom/backlight": { + "exec": "echo '✨'", + "interval": 1, + "format": "{}" +}, + +"tray#cam": { + "icon-size": 16, + "spacing": 10 +}, + +"network#cam": { + "format": "{ifname}", + "format-wifi": "{icon}", + "format-ethernet": "󰌘", + "format-disconnected": "󰌙", + "tooltip-format": "{ipaddr}  {bandwidthUpBytes}  {bandwidthDownBytes}", + "format-linked": "󰈁 {ifname} (No IP)", + "tooltip-format-wifi": "{essid} {icon} {signalStrength}%", + "tooltip-format-ethernet": "{ifname} 󰌘", + "tooltip-format-disconnected": "󰌙 Disconnected", + "max-length": 50, + "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"] +}, + +"wlr/taskbar": { + "format": "{icon}", + "icon-size": 14, + "icon-theme": "Numix-Circle", + "tooltip-format": "{title}", + "on-click": "activate", + "on-click-middle": "close", + "ignore-list": [ + "kitty" ], "app_ids-mapping": { "firefoxdeveloperedition": "firefox-developer-edition" @@ -160,15 +158,5 @@ "Firefox Web Browser": "Firefox", "Foot Server": "Terminal" } - } - - - - - - - - - - +} } \ No newline at end of file diff --git a/config/waybar/configs/Chrysanthemum b/config/waybar/configs/Chrysanthemum index 95c6686..598a666 100644 --- a/config/waybar/configs/Chrysanthemum +++ b/config/waybar/configs/Chrysanthemum @@ -5,83 +5,79 @@ //* --- 👍 designed by https://github.com/Krautt 👍 --- */ { - - - "include": "~/.config/waybar/modules", - "layer": "top", - //"mode": "dock", - "exclusive": true, - "passthrough": false, - "position": "top", - "spacing": 5, - "fixed-center": false, - "ipc": true, - "margin-top": 0, - "margin-bottom": 5, +"include": "~/.config/waybar/modules", +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "top", +"spacing": 5, +"fixed-center": false, +"ipc": true, +"margin-top": 0, +//"margin-bottom": 5, - "modules-left": ["clock#gar","tray"], - - "modules-center": ["hyprland/workspaces#gar"], +"modules-left": ["clock#gar","tray"], + +"modules-center": ["hyprland/workspaces#gar"], - "modules-right": ["pulseaudio#gar","backlight#gar", "battery#gar"], +"modules-right": ["pulseaudio#gar","backlight#gar", "battery#gar"], +// M O D U L E S // - // M O D U L E S // +"hyprland/workspaces#gar": { + "active-only": false, + "all-outputs": true, + "format": "{icon}", + "show-special": false, + "on-click": "activate", + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1", + "persistent_workspaces": { + "1": [], + "2": [], + "3": [], + "4": [], + "5": [], +}, + "format-icons": { + "active": "", + "default": "", + } +}, - "hyprland/workspaces#gar": { - "active-only": false, - "all-outputs": true, - "format": "{icon}", - "show-special": false, - "on-click": "activate", - "on-scroll-up": "hyprctl dispatch workspace e+1", - "on-scroll-down": "hyprctl dispatch workspace e-1", - "persistent_workspaces": { - "1": [], - "2": [], - "3": [], - "4": [], - "5": [], - }, - "format-icons": { - "active": "", - "default": "", - } - - }, +"clock#gar": { + "format": "{:%a %d | %H:%M}", + "format-alt": "{:%A, %d %B, %Y (%R)}" +}, - "clock#gar": { - "format": "{:%a %d | %H:%M}", - "format-alt": "{:%A, %d %B, %Y (%R)}" - }, +"hyprland/window#gar": { + "format": "{}", + "max-length": 60 +}, - "hyprland/window#gar": { - "format": "{}", - "max-length": 60 - }, +"tray#gar": { + "icon-size": 15, + "spacing": 10 +}, - "tray#gar": { - "icon-size": 15, - "spacing": 10 +"pulseaudio#gar": { + "format": "{icon} {volume}%", + "format-bluetooth": "{icon} {volume}%", + "format-bluetooth-muted": " {icon}", + "format-muted": "󰸈", + "format-icons": { + "headphone": "", + "hands-free": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": ["", "", ""] }, - - "pulseaudio#gar": { - "format": "{icon} {volume}%", - "format-bluetooth": "{icon} {volume}%", - "format-bluetooth-muted": " {icon}", - "format-muted": "󰸈", - "format-icons": { - "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", "", ""] - }, - "on-click": "pamixer --toggle-mute", -"on-click-right": "pavucontrol", -"tooltip": false + "on-click": "pamixer --toggle-mute", + "on-click-right": "pavucontrol", + "tooltip": false }, "backlight#gar": { @@ -90,7 +86,6 @@ "format-icons": ["", ""] }, - "battery#gar": { "interval": 60, "align": 0, @@ -115,7 +110,5 @@ "tooltip-format": "{timeTo} {power}w", "on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh", "on-click-right": "~/.config/hypr/scripts/Wlogout.sh", -}, - - +}, } \ No newline at end of file diff --git a/config/waybar/configs/Gardenia b/config/waybar/configs/Gardenia index 6dc88ed..0adec1c 100644 --- a/config/waybar/configs/Gardenia +++ b/config/waybar/configs/Gardenia @@ -7,81 +7,80 @@ { - "include": "~/.config/waybar/modules", - "layer": "top", - //"mode": "dock", - "exclusive": true, - "passthrough": false, - "position": "bottom", - "spacing": 5, - "fixed-center": false, - "ipc": true, - "margin-top": 5, - "margin-bottom": 5, - "width": 768, +"include": "~/.config/waybar/modules", +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "bottom", +"spacing": 5, +"fixed-center": false, +"ipc": true, +//"margin-top": 5, +"margin-bottom": 5, +"width": 768, - "modules-left": ["clock#gar","tray"], +"modules-left": ["clock#gar","tray"], - "modules-center": ["hyprland/workspaces#gar"], +"modules-center": ["hyprland/workspaces#gar"], - "modules-right": ["pulseaudio#gar","backlight#gar", "battery#gar"], +"modules-right": ["pulseaudio#gar","backlight#gar", "battery#gar"], - // M O D U L E S // - - "hyprland/workspaces#gar": { - "disable-scroll": true, - "all-outputs": true, - "format": "{icon}", - "persistent_workspaces": { - "1": [], - "2": [], - "3": [], - "4": [], - "5": [] - }, - "format-icons": { - "1": "一", - "2": "二", - "3": "三", - "4": "四", - "5": "五" - } +// M O D U L E S // +"hyprland/workspaces#gar": { + "disable-scroll": true, + "all-outputs": true, + "format": "{icon}", + "persistent_workspaces": { + "1": [], + "2": [], + "3": [], + "4": [], + "5": [] }, + "format-icons": { + "1": "一", + "2": "二", + "3": "三", + "4": "四", + "5": "五" + } +}, - "clock#gar": { - "format": "{:%a %d | %H:%M %p}", - "format-alt": "{:%A, %d %B, %Y (%R)}" - }, +"clock#gar": { + "format": "{:%a %d | %H:%M %p}", + "format-alt": "{:%A, %d %B, %Y (%R)}" +}, - "hyprland/window#gar": { - "format": "{}", - "max-length": 60 - }, +"hyprland/window#gar": { + "format": "{}", + "max-length": 60 +}, - "tray#gar": { - "icon-size": 15, - "spacing": 10 - }, +"tray#gar": { + "icon-size": 15, + "spacing": 10 +}, - "pulseaudio#gar": { - "format": "{icon} {volume}%", - "format-bluetooth": "{icon} {volume}%", - "format-bluetooth-muted": " {icon}", - "format-muted": "󰸈", - "format-icons": { - "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", "", ""] +"pulseaudio#gar": { + "format": "{icon} {volume}%", + "format-bluetooth": "{icon} {volume}%", + "format-bluetooth-muted": " {icon}", + "format-muted": "󰸈", + "format-icons": { + "headphone": "", + "hands-free": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": ["", "", ""] }, - "on-click": "pamixer --toggle-mute", -"on-click-right": "pavucontrol", -"tooltip": false + "on-click": "pamixer --toggle-mute", + "on-click-right": "pavucontrol", + "tooltip": false }, "backlight#gar": { @@ -90,7 +89,6 @@ "format-icons": ["", ""] }, - "battery#gar": { "interval": 60, "align": 0, @@ -116,6 +114,5 @@ "on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh", "on-click-right": "~/.config/hypr/scripts/Wlogout.sh", }, - - + } \ No newline at end of file diff --git a/config/waybar/configs/Peony b/config/waybar/configs/Peony index c539697..0c49020 100644 --- a/config/waybar/configs/Peony +++ b/config/waybar/configs/Peony @@ -6,124 +6,124 @@ { - "include": "~/.config/waybar/modules", - "layer": "top", - //"mode": "dock", - "exclusive": true, - "passthrough": false, - "position": "top", - "spacing": 0, - "fixed-center": false, - "ipc": true, - "margin-top": 5, - "margin-bottom": 5, - "width": 1444, +"include": "~/.config/waybar/modules", +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "top", +"spacing": 0, +"fixed-center": false, +"ipc": true, +"margin-top": 5, +//"margin-bottom": 5, +"width": 1444, - "modules-left": ["hyprland/workspaces#peony", "tray#peony"], - - "modules-center": ["clock#peony"], +"modules-left": ["hyprland/workspaces#peony", "tray#peony"], + +"modules-center": ["clock#peony"], - "modules-right": ["wireplumber#peony","custom/separator#line","backlight#peony","custom/separator#line","temperature#peony","custom/separator#line","battery#peony","network#peony"], +"modules-right": ["wireplumber#peony","custom/separator#line","backlight#peony","custom/separator#line","temperature#peony","custom/separator#line","battery#peony","network#peony"], - //M O D U L E S // +//M O D U L E S // - "hyprland/workspaces#peony": { - "active-only":false, - "all-outputs": true, - "format": "{icon}", - "on-click": "activate", - "persistent_workspaces":{ - "1": [], - "2": [], - "3": [], - "4": [], - "5": [] - }, - "format-icons": { - "1": "I", - "2": "II", - "3": "III", - "4": "IV", - "5": "V" - - } - }, +"hyprland/workspaces#peony": { + "active-only":false, + "all-outputs": true, + "format": "{icon}", + "on-click": "activate", + "persistent_workspaces":{ + "1": [], + "2": [], + "3": [], + "4": [], + "5": [] + }, + "format-icons": { + "1": "I", + "2": "II", + "3": "III", + "4": "IV", + "5": "V" + + } + }, - "clock#peony": { - "interval": 60, - "tooltip-format": "{:%B %Y}\n{calendar}", - "format": "{:%B | %a %d, %Y | %H:%M %p}", - "format-alt": "{:%a %b %d, %G}" - }, +"clock#peony": { + "interval": 60, + "tooltip-format": "{:%B %Y}\n{calendar}", + "format": "{:%B | %a %d, %Y | %H:%M %p}", + "format-alt": "{:%a %b %d, %G}" +}, - "wireplumber#peony": { - "format": "{icon} {volume}", - "format-muted": " Mute", - "on-click": "~/.config/hypr/scripts/Volume.sh --toggle", - "on-click-right": "pavucontrol -t 3", - "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc", - "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec", - "format-icons": ["", "", "󰕾", ""], - }, +"wireplumber#peony": { + "format": "{icon} {volume}", + "format-muted": " Mute", + "on-click": "~/.config/hypr/scripts/Volume.sh --toggle", + "on-click-right": "pavucontrol -t 3", + "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc", + "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec", + "format-icons": ["", "", "󰕾", ""], +}, - "backlight#peony": { - "device": "intel_backlight", - "format": "{percent}% {icon}", - "format-icons": ["󰛩", "󱩎", "󱩏", "󱩑", "󱩒", "󱩓", "󱩔", "󱩕", "󰛨"], - }, +"backlight#peony": { + "device": "intel_backlight", + "format": "{percent}% {icon}", + "format-icons": ["󰛩", "󱩎", "󱩏", "󱩑", "󱩒", "󱩓", "󱩔", "󱩕", "󰛨"], +}, - "temperature#peony": { - // "thermal-zone": 2, - // "hwmon-path": ["/sys/class/hwmon/hwmon2/temp1_input", "/sys/class/thermal/thermal_zone0/temp"], - // "critical-threshold": 80, - // "format-critical": "{temperatureC}°C ", - "format": "{temperatureC}°C " +"temperature#peony": { + // "thermal-zone": 2, + // "hwmon-path": ["/sys/class/hwmon/hwmon2/temp1_input", "/sys/class/thermal/thermal_zone0/temp"], + // "critical-threshold": 80, + // "format-critical": "{temperatureC}°C ", + "format": "{temperatureC}°C " - }, +}, - "network#peony": { - "format": "{ifname}", - "format-wifi": "{icon}", - "format-ethernet": "󰌘", - "format-disconnected": "󰌙", - "tooltip-format": "{ipaddr}  {bandwidthUpBytes}  {bandwidthDownBytes}", - "format-linked": "󰈁 {ifname} (No IP)", - "tooltip-format-wifi": "{essid} {icon} {signalStrength}%", - "tooltip-format-ethernet": "{ifname} 󰌘", - "tooltip-format-disconnected": "󰌙 Disconnected", - "max-length": 50, - "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"] - }, +"network#peony": { + "format": "{ifname}", + "format-wifi": "{icon}", + "format-ethernet": "󰌘", + "format-disconnected": "󰌙", + "tooltip-format": "{ipaddr}  {bandwidthUpBytes}  {bandwidthDownBytes}", + "format-linked": "󰈁 {ifname} (No IP)", + "tooltip-format-wifi": "{essid} {icon} {signalStrength}%", + "tooltip-format-ethernet": "{ifname} 󰌘", + "tooltip-format-disconnected": "󰌙 Disconnected", + "max-length": 50, + "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"] +}, - "battery#peony": { - "interval": 60, - "align": 0, - "rotate": 0, - //"bat": "BAT1", - //"adapter": "ACAD", - "full-at": 100, - "design-capacity": false, - "states": { - "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{icon} {capacity}%", - "format-charging": " {capacity}%", - "format-plugged": "󱘖 {capacity}%", - "format-full": "{icon} Full", - "format-alt": "{icon} {time}", - "format-icons": ["", "", "", "", ""], - "format-time": "{H}h {M}min", - "tooltip": true, - "tooltip-format": "{timeTo} {power}w", - "on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh", - "on-click-right": "~/.config/hypr/scripts/Wlogout.sh", - }, +"battery#peony": { + "interval": 60, + "align": 0, + "rotate": 0, + //"bat": "BAT1", + //"adapter": "ACAD", + "full-at": 100, + "design-capacity": false, + "states": { + "good": 95, + "warning": 30, + "critical": 15 + }, + "format": "{icon} {capacity}%", + "format-charging": " {capacity}%", + "format-plugged": "󱘖 {capacity}%", + "format-full": "{icon} Full", + "format-alt": "{icon} {time}", + "format-icons": ["", "", "", "", ""], + "format-time": "{H}h {M}min", + "tooltip": true, + "tooltip-format": "{timeTo} {power}w", + "on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh", + "on-click-right": "~/.config/hypr/scripts/Wlogout.sh", +}, - "tray#peony": { - "icon-size": 17, - "spacing": 8, - } +"tray#peony": { + "icon-size": 17, + "spacing": 8, +} } \ No newline at end of file