From 01e5a8ad75d0ef9d516350b16eeeeeb5e3b9e165 Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" Date: Tue, 21 Nov 2023 19:22:11 +0900 Subject: [PATCH] Clean up waybar modules and configs --- config/waybar/configs/Bottom & Left | 2 +- config/waybar/configs/Bottom & Right | 2 +- config/waybar/configs/Camellia [TOP] | 4 +-- config/waybar/configs/Chrysanthemum [Bottom] | 24 +------------ config/waybar/configs/Chrysanthemum [TOP] | 23 +------------ config/waybar/configs/Default [Bottom] | 2 +- config/waybar/configs/Default [TOP] | 2 +- config/waybar/configs/Gardenia [Bottom] | 22 +----------- config/waybar/configs/Gardenia [TOP] | 22 +----------- config/waybar/configs/Peony [Bottom] | 24 +------------ config/waybar/configs/Peony [TOP] | 24 +------------ config/waybar/configs/Simple-L [TOP] | 2 +- config/waybar/configs/Simple-S [TOP] | 2 +- config/waybar/configs/Top & Bottom | 2 +- config/waybar/configs/Top & Left | 2 +- config/waybar/configs/Top & Right | 2 +- config/waybar/modules | 36 ++++++++++++++++++-- 17 files changed, 50 insertions(+), 147 deletions(-) diff --git a/config/waybar/configs/Bottom & Left b/config/waybar/configs/Bottom & Left index da0bc68..b3edeea 100644 --- a/config/waybar/configs/Bottom & Left +++ b/config/waybar/configs/Bottom & Left @@ -26,7 +26,7 @@ "modules-center": [ //"hyprland/window", - "hyprland/workspaces#2", + "hyprland/workspaces#roman", ], "modules-right": [ diff --git a/config/waybar/configs/Bottom & Right b/config/waybar/configs/Bottom & Right index a715706..255ddf2 100644 --- a/config/waybar/configs/Bottom & Right +++ b/config/waybar/configs/Bottom & Right @@ -26,7 +26,7 @@ "modules-center": [ //"hyprland/window", - "hyprland/workspaces#2", + "hyprland/workspaces#roman", ], "modules-right": [ diff --git a/config/waybar/configs/Camellia [TOP] b/config/waybar/configs/Camellia [TOP] index dd8c87d..601be63 100644 --- a/config/waybar/configs/Camellia [TOP] +++ b/config/waybar/configs/Camellia [TOP] @@ -107,7 +107,7 @@ "pulseaudio/slider": { "min": 0, "max": 100, - "orientation": "horizontal" + "orientation": "horizontal", }, @@ -121,7 +121,7 @@ "min": 0, "max": 100, "orientation": "horizontal", - "device": "intel_backlight" + //"device": "intel_backlight" }, "custom/backlight": { diff --git a/config/waybar/configs/Chrysanthemum [Bottom] b/config/waybar/configs/Chrysanthemum [Bottom] index 9f1f192..8b2c542 100644 --- a/config/waybar/configs/Chrysanthemum [Bottom] +++ b/config/waybar/configs/Chrysanthemum [Bottom] @@ -19,33 +19,11 @@ "modules-left": ["clock#gar","tray"], -"modules-center": ["hyprland/workspaces#gar"], +"modules-center": ["hyprland/workspaces"], "modules-right": ["pulseaudio#gar","backlight#gar", "battery#gar"], // 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": "", - } -}, - "clock#gar": { //"format": "{:%A, %I:%M %P}", "format": "{:%a %d | %H:%M}", diff --git a/config/waybar/configs/Chrysanthemum [TOP] b/config/waybar/configs/Chrysanthemum [TOP] index 665eec5..4f691b3 100644 --- a/config/waybar/configs/Chrysanthemum [TOP] +++ b/config/waybar/configs/Chrysanthemum [TOP] @@ -19,33 +19,12 @@ "modules-left": ["clock#gar","tray"], -"modules-center": ["hyprland/workspaces#gar"], +"modules-center": ["hyprland/workspaces"], "modules-right": ["pulseaudio#gar","backlight#gar", "battery#gar"], // 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": "", - } -}, - "clock#gar": { //"format": "{:%A, %I:%M %P}", "format": "{:%a %d | %H:%M}", diff --git a/config/waybar/configs/Default [Bottom] b/config/waybar/configs/Default [Bottom] index 512995d..f2eb8d2 100644 --- a/config/waybar/configs/Default [Bottom] +++ b/config/waybar/configs/Default [Bottom] @@ -16,7 +16,7 @@ "margin-right": 8, "modules-left": [ - "hyprland/workspaces#3", + "hyprland/workspaces#pacman", "custom/separator#dot-line", "cpu", "custom/separator#dot-line", diff --git a/config/waybar/configs/Default [TOP] b/config/waybar/configs/Default [TOP] index 2f8678f..6b620f6 100644 --- a/config/waybar/configs/Default [TOP] +++ b/config/waybar/configs/Default [TOP] @@ -16,7 +16,7 @@ "margin-right": 8, "modules-left": [ - "hyprland/workspaces#3", + "hyprland/workspaces#pacman", "custom/separator#dot-line", "cpu", "custom/separator#dot-line", diff --git a/config/waybar/configs/Gardenia [Bottom] b/config/waybar/configs/Gardenia [Bottom] index 8e0ce16..5b5a089 100644 --- a/config/waybar/configs/Gardenia [Bottom] +++ b/config/waybar/configs/Gardenia [Bottom] @@ -22,33 +22,13 @@ "modules-left": ["clock#gar","tray"], -"modules-center": ["hyprland/workspaces#gar"], +"modules-center": ["hyprland/workspaces#kanji"], "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": "五" - } -}, - "clock#gar": { //"format": "{:%A, %I:%M %P}", "format": "{:%a %d | %H:%M}", diff --git a/config/waybar/configs/Gardenia [TOP] b/config/waybar/configs/Gardenia [TOP] index 6eedd78..358db1c 100644 --- a/config/waybar/configs/Gardenia [TOP] +++ b/config/waybar/configs/Gardenia [TOP] @@ -21,33 +21,13 @@ "modules-left": ["clock#gar","tray"], -"modules-center": ["hyprland/workspaces#gar"], +"modules-center": ["hyprland/workspaces#kanji"], "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": "五" - } -}, - "clock#gar": { //"format": "{:%A, %I:%M %P}", "format": "{:%a %d | %H:%M}", diff --git a/config/waybar/configs/Peony [Bottom] b/config/waybar/configs/Peony [Bottom] index 6e186a7..1ec4fb6 100644 --- a/config/waybar/configs/Peony [Bottom] +++ b/config/waybar/configs/Peony [Bottom] @@ -19,7 +19,7 @@ "margin-bottom": 5, "width": 1444, -"modules-left": ["hyprland/workspaces#peony", "tray#peony"], +"modules-left": ["hyprland/workspaces#roman", "tray#peony"], "modules-center": ["clock#peony"], @@ -36,28 +36,6 @@ //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" - - } - }, - "clock#peony": { "interval": 60, "tooltip-format": "{:%B %Y}\n{calendar}", diff --git a/config/waybar/configs/Peony [TOP] b/config/waybar/configs/Peony [TOP] index 66dbc7d..d124667 100644 --- a/config/waybar/configs/Peony [TOP] +++ b/config/waybar/configs/Peony [TOP] @@ -19,7 +19,7 @@ //"margin-bottom": 5, "width": 1444, -"modules-left": ["hyprland/workspaces#peony", "tray#peony"], +"modules-left": ["hyprland/workspaces#roman", "tray#peony"], "modules-center": ["clock#peony"], @@ -36,28 +36,6 @@ //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" - - } - }, - "clock#peony": { "interval": 60, "tooltip-format": "{:%B %Y}\n{calendar}", diff --git a/config/waybar/configs/Simple-L [TOP] b/config/waybar/configs/Simple-L [TOP] index 4baf027..a818400 100644 --- a/config/waybar/configs/Simple-L [TOP] +++ b/config/waybar/configs/Simple-L [TOP] @@ -19,7 +19,7 @@ "modules-left": [ "custom/menu", "custom/separator#blank_2", - "hyprland/workspaces", + "hyprland/workspaces#pacman", "custom/separator#blank_2", "tray", ], diff --git a/config/waybar/configs/Simple-S [TOP] b/config/waybar/configs/Simple-S [TOP] index ebeb982..cb11449 100644 --- a/config/waybar/configs/Simple-S [TOP] +++ b/config/waybar/configs/Simple-S [TOP] @@ -15,7 +15,7 @@ ], "modules-center": [ - "hyprland/workspaces#2" + "hyprland/workspaces#roman" ], "modules-right": [ diff --git a/config/waybar/configs/Top & Bottom b/config/waybar/configs/Top & Bottom index ae9c546..1830515 100644 --- a/config/waybar/configs/Top & Bottom +++ b/config/waybar/configs/Top & Bottom @@ -61,7 +61,7 @@ ], "modules-center": [ - "hyprland/workspaces#2", + "hyprland/workspaces#4", ], "modules-right": [ diff --git a/config/waybar/configs/Top & Left b/config/waybar/configs/Top & Left index 7c0532f..7270079 100644 --- a/config/waybar/configs/Top & Left +++ b/config/waybar/configs/Top & Left @@ -25,7 +25,7 @@ "modules-center": [ //"hyprland/window", - "hyprland/workspaces#3", + "hyprland/workspaces#pacman", ], "modules-right": [ diff --git a/config/waybar/configs/Top & Right b/config/waybar/configs/Top & Right index 065a995..1d23b02 100644 --- a/config/waybar/configs/Top & Right +++ b/config/waybar/configs/Top & Right @@ -25,7 +25,7 @@ "modules-center": [ //"hyprland/window", - "hyprland/workspaces#3", + "hyprland/workspaces#pacman", ], "modules-right": [ diff --git a/config/waybar/modules b/config/waybar/modules index 31011cd..016f368 100644 --- a/config/waybar/modules +++ b/config/waybar/modules @@ -24,7 +24,7 @@ }, }, // ROMAN Numerals style -"hyprland/workspaces#2": { +"hyprland/workspaces#roman": { "active-only":false, "all-outputs": true, "format": "{icon}", @@ -45,11 +45,16 @@ "3": "III", "4": "IV", "5": "V", + "6": "VI", + "7": "VII", + "8": "VIII", + "9": "IX", + "10": "X", }, }, // PACMAN Style -"hyprland/workspaces#3": { +"hyprland/workspaces#pacman": { "active-only":false, "all-outputs": true, "format": "{icon}", @@ -67,11 +72,36 @@ "format": "{icon}", "format-icons": { "active": " 󰮯 ", - "default": "  ", + "default": "󰑊", "persistent":"󰑊", }, }, +"hyprland/workspaces#kanji": { + "disable-scroll": true, + "all-outputs": true, + "format": "{icon}", + "persistent_workspaces": { + "1": [], + "2": [], + "3": [], + "4": [], + "5": [], + }, + "format-icons": { + "1": "一", + "2": "二", + "3": "三", + "4": "四", + "5": "五", + "6": "六", + "7": "七", + "8": "八", + "9": "九", + "10": "十", + } +}, + // NUMBERS and ICONS style "hyprland/workspaces#4": { "format": "{name}",