From 563e126ab3d877ea4fae4cec83006ee7dc240d65 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 13 Nov 2023 09:08:33 +0900 Subject: [PATCH] waybar latte and mocha tweaked abit --- config/waybar/modules | 61 +++++++++---------- .../waybar/style/style-catppuccin-latte.css | 31 +++++----- .../waybar/style/style-catppuccin-mocha.css | 31 +++++----- 3 files changed, 59 insertions(+), 64 deletions(-) diff --git a/config/waybar/modules b/config/waybar/modules index 301b6b9..529a83d 100644 --- a/config/waybar/modules +++ b/config/waybar/modules @@ -1,75 +1,69 @@ -//* ---- 💫 https://github.com/JaKooLit 💫 ---- *// - { -// HYPRLAND WORKSPACES. CHOOSE as desired and place on waybar configs +// HYPRLAND WORKSPACES. CHOOSE as required // CIRCLES Style -"hyprland/workspaces": { - "active-only": false, - "all-outputs": true, + "hyprland/workspaces": { + "all-outputs": true, "format": "{icon}", - "show-special": false, "on-click": "activate", - "on-scroll-up": "hyprctl dispatch workspace e+1", +"on-scroll-up": "hyprctl dispatch workspace e+1", "on-scroll-down": "hyprctl dispatch workspace e-1", "persistent_workspaces": { "1": [], "2": [], "3": [], "4": [], - "5": [], + "5": [] }, "format-icons": { "active": "", "default": "", - }, }, + "active-only": false, + "all-outputs": true +}, + // ROMAN Numerals style "hyprland/workspaces#2": { "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": [], + "5": [] }, "format-icons": { "1": "I", "2": "II", "3": "III", "4": "IV", - "5": "V", + "5": "V" - }, + } }, + // PACMAN Style "hyprland/workspaces#3": { "active-only":false, "all-outputs": true, "format": "{icon}", "on-click": "activate", - "on-scroll-up": "hyprctl dispatch workspace e+1", - "on-scroll-down": "hyprctl dispatch workspace e-1", - "show-special": false, "persistent_workspaces":{ "1": [], "2": [], "3": [], "4": [], - "5": [], + "5": [] }, "format": "{icon}", "format-icons": { "active": " 󰮯 ", "default": "  ", - "persistent":"󰑊", - }, + "persistent":"󰑊" + } }, // NUMBERS and ICONS style @@ -79,8 +73,6 @@ //"format": " {icon} ", "show-special": false, "on-click": "activate", - "on-scroll-up": "hyprctl dispatch workspace e+1", - "on-scroll-down": "hyprctl dispatch workspace e-1", "all-outputs": true, "sort-by-number": true, "format-icons": { @@ -96,8 +88,11 @@ "10": "10", "focused": "", "default": "", - }, + }, + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1", }, + "backlight": { "interval": 2, "align": 0, @@ -332,8 +327,8 @@ "temperature": { "interval": 10, "tooltip": false, - //"hwmon-path": "/sys/class/hwmon/hwmon5/temp1_input", - "thermal-zone": 0, + "hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input", + //"thermal-zone": 0, "critical-threshold": 82, "format-critical": "{temperatureC}°C {icon}", "format": "{temperatureC}°C {icon}", @@ -342,7 +337,7 @@ }, "tray": { - "icon-size": 17, + //"icon-size": 17, "spacing": 8, }, @@ -413,7 +408,11 @@ "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} ~ {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F", "on-click-middle": "playerctl play-pause", "on-click": "playerctl previous", - "on-click-right": "playerctl next" + "on-click-right": "playerctl next", + "scroll-step": 5.0, + "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc", + "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec", + "smooth-scrolling-threshold": 1, }, "custom/power": { @@ -553,8 +552,8 @@ "temperature#vertical": { "interval": 10, "tooltip": true, - //"hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input", - "thermal-zone": 0, + "hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input", + //"thermal-zone": 0, "critical-threshold": 80, "format-critical": "{icon}\n{temperatureC}°C", "format": " {icon}", diff --git a/config/waybar/style/style-catppuccin-latte.css b/config/waybar/style/style-catppuccin-latte.css index c497398..80636d5 100644 --- a/config/waybar/style/style-catppuccin-latte.css +++ b/config/waybar/style/style-catppuccin-latte.css @@ -17,8 +17,9 @@ margin-bottom: 1px; window#waybar { transition-property: background-color; transition-duration: 0.5s; + /*background: transparent;*/ + border: 2px solid @sapphire; background: @theme_base_color; - border: 2px solid @overlay0; border-radius: 10px; } @@ -30,18 +31,20 @@ window#waybar.hidden { background: none; } -/* This section can be use if you want to separate waybar modules */ -/* .modules-left, .modules-center, .modules-right { */ -/* background: @theme_base_color; */ -/* border: 3px solid @overlay0; */ -/* padding: 0px 5px; */ -/* border-radius: 5; */ -/* } */ +/* This section can be use if you want to separate waybar modules*/ +/* Remember to set transparent on waybar above */ +/*.modules-left, .modules-center, .modules-right { */ +/* background: @theme_base_color; */ +/* border: 0.5px solid @overlay0; */ +/* padding: 0px 5px; */ +/* border-radius: 10px; */ +/*} */ + +/* .modules-left, .modules-right { */ +/* border: 1px solid @blue; */ +/* margin: 0px 5px;*/ +/*}*/ -/* .modules-center { */ - /* border: 3px solid @lavender; */ - /* margin: 0px 5px; */ -/* } */ #backlight, #battery, @@ -138,10 +141,6 @@ window#waybar.hidden { color: @teal; } -#temperature.critical { - background-color: @red; -} - #tray > .passive { -gtk-icon-effect: dim; } diff --git a/config/waybar/style/style-catppuccin-mocha.css b/config/waybar/style/style-catppuccin-mocha.css index 1b8c296..23ee293 100644 --- a/config/waybar/style/style-catppuccin-mocha.css +++ b/config/waybar/style/style-catppuccin-mocha.css @@ -17,8 +17,9 @@ margin-bottom: 1px; window#waybar { transition-property: background-color; transition-duration: 0.5s; - background: @theme_base_color; - border: 2px solid @overlay0; + background: transparent; + /*border: 2px solid @overlay0;*/ + /*background: @theme_base_color;*/ border-radius: 10px; } @@ -31,17 +32,17 @@ window#waybar.hidden { } /* This section can be use if you want to separate waybar modules */ -/* .modules-left, .modules-center, .modules-right { */ -/* background: @theme_base_color; */ -/* border: 3px solid @overlay0; */ -/* padding: 0px 5px; */ -/* border-radius: 5; */ -/* } */ - -/* .modules-center { */ - /* border: 3px solid @lavender; */ - /* margin: 0px 5px; */ -/* } */ +.modules-left, .modules-center, .modules-right { + background: @theme_base_color; + border: 0.5px solid @overlay0; + padding: 0px 5px; + border-radius: 10px; +} + + .modules-left, .modules-right { + border: 1px solid @blue; + /*margin: 0px 5px;*/ +} #backlight, #battery, @@ -138,10 +139,6 @@ window#waybar.hidden { color: @teal; } -#temperature.critical { - background-color: @red; -} - #tray > .passive { -gtk-icon-effect: dim; }