From 43eb8fa817632e3f14e62c081d92cdda7c09b4ac Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 23 May 2024 23:29:04 +0900 Subject: [PATCH] Waybar Enhancements, groups, etc --- config/waybar/configs/[TOP] Default Laptop_v2 | 7 +- config/waybar/configs/[TOP] Default Laptop_v3 | 55 ++++ config/waybar/configs/[TOP] Default_v3 | 54 ++++ config/waybar/configs/[TOP] Simple | 10 +- config/waybar/modules | 46 ++- ...llust Bordered] Chroma Simple (copy 1).css | 306 ++++++++++++++++++ .../[Wallust Bordered] Chroma Simple.css | 28 +- config/waybar/wallust/colors-waybar.css | 38 +-- 8 files changed, 497 insertions(+), 47 deletions(-) create mode 100644 config/waybar/configs/[TOP] Default Laptop_v3 create mode 100644 config/waybar/configs/[TOP] Default_v3 create mode 100644 config/waybar/style/[Wallust Bordered] Chroma Simple (copy 1).css diff --git a/config/waybar/configs/[TOP] Default Laptop_v2 b/config/waybar/configs/[TOP] Default Laptop_v2 index 9021f0b..6ddab7d 100644 --- a/config/waybar/configs/[TOP] Default Laptop_v2 +++ b/config/waybar/configs/[TOP] Default Laptop_v2 @@ -19,7 +19,8 @@ "custom/menu", "custom/light_dark", "custom/separator#dot-line", - "group/motherboard", + "power-profiles-daemon", + "group/mobo_drawer", "custom/separator#blank", "group/laptop", "custom/separator#line", @@ -40,15 +41,15 @@ "modules-right": [ "network#speed", + "group/connections", "custom/separator#line", "tray", "mpris", - "bluetooth", "group/audio", + "custom/separator#line", "keyboard-state", "custom/keyboard", "custom/lock", - "custom/separator#dot-line", "custom/power", ], } \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default Laptop_v3 b/config/waybar/configs/[TOP] Default Laptop_v3 new file mode 100644 index 0000000..6ddab7d --- /dev/null +++ b/config/waybar/configs/[TOP] Default Laptop_v3 @@ -0,0 +1,55 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### DEFAULT v2 (Laptop) - Top ### // +{ +"include": "~/.config/waybar/modules", +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "top", +"spacing": 3, +"fixed-center": true, +"ipc": true, +"margin-top": 3, +"margin-left": 8, +"margin-right": 8, + +"modules-left": [ + "custom/menu", + "custom/light_dark", + "custom/separator#dot-line", + "power-profiles-daemon", + "group/mobo_drawer", + "custom/separator#blank", + "group/laptop", + "custom/separator#line", + "custom/weather", + ], + +"modules-center": [ + "custom/swaync", + "custom/cava_mviz", + "custom/separator#dot-line", + "clock", + "custom/separator#line", + "hyprland/workspaces#roman", + "custom/separator#dot-line", + "idle_inhibitor", + "custom/hint", + ], + +"modules-right": [ + "network#speed", + "group/connections", + "custom/separator#line", + "tray", + "mpris", + "group/audio", + "custom/separator#line", + "keyboard-state", + "custom/keyboard", + "custom/lock", + "custom/power", + ], +} \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default_v3 b/config/waybar/configs/[TOP] Default_v3 new file mode 100644 index 0000000..d32f24e --- /dev/null +++ b/config/waybar/configs/[TOP] Default_v3 @@ -0,0 +1,54 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### DEFAULT v3 - Top ### // +{ +"include": "~/.config/waybar/modules", +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "top", +"spacing": 3, +"fixed-center": true, +"ipc": true, +"margin-top": 3, +"margin-left": 8, +"margin-right": 8, + +"modules-left": [ + "custom/menu", + "custom/light_dark", + "custom/separator#dot-line", + "power-profiles-daemon", + "group/mobo_drawer", + "custom/separator#blank", + "custom/separator#line", + "custom/weather", + ], + +"modules-center": [ + "custom/swaync", + "custom/cava_mviz", + "custom/separator#dot-line", + "clock", + "custom/separator#line", + "hyprland/workspaces#roman", + "custom/separator#dot-line", + "idle_inhibitor", + "custom/hint", + ], + +"modules-right": [ + "network#speed", + "group/connections", + "custom/separator#line", + "tray", + "mpris", + "group/audio", + "custom/separator#line", + "keyboard-state", + "custom/keyboard", + "custom/lock", + "custom/power", + ], +} \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Simple b/config/waybar/configs/[TOP] Simple index 505ea63..09488c5 100644 --- a/config/waybar/configs/[TOP] Simple +++ b/config/waybar/configs/[TOP] Simple @@ -15,9 +15,10 @@ "modules-left": [ "idle_inhibitor", + "group/mobo_drawer", "hyprland/workspaces#rw", + "tray", "mpris", - "hyprland/window" ], "modules-center": [ @@ -25,10 +26,9 @@ ], "modules-right": [ - "tray", - "battery", - "pulseaudio", - "pulseaudio#microphone", + "hyprland/window", + "battery", + "group/audio", "custom/power", ], } diff --git a/config/waybar/modules b/config/waybar/modules index c1f4687..071efb3 100644 --- a/config/waybar/modules +++ b/config/waybar/modules @@ -170,20 +170,51 @@ "disk", ] }, +"group/mobo_drawer": { + "orientation": "inherit", + "drawer": { + "transition-duration": 500, + "children-class": "cpu", + "transition-left-to-right": true + }, + "modules": [ + "temperature", + "cpu", + "memory", + "disk", + ] +}, "group/laptop": { - "orientation": "horizontal", + "orientation": "inherit", "modules": [ "backlight", "battery", ] }, "group/audio": { - "orientation": "horizontal", + "orientation": "inherit", + "drawer": { + "transition-duration": 500, + "children-class": "pulseaudio", + "transition-left-to-right": true + }, "modules": [ "pulseaudio", "pulseaudio#microphone", ] }, +"group/connections": { + "orientation": "inherit", + "drawer": { + "transition-duration": 500, + "children-class": "bluetooth", + "transition-left-to-right": true + }, + "modules": [ + "network", + "bluetooth", + ] +}, "backlight": { "interval": 2, "align": 0, @@ -414,6 +445,17 @@ "󰤯", "󰤟", "󰤢", "󰤥", "󰤨" ] }, +"power-profiles-daemon": { + "format": "{icon}", + "tooltip-format": "Power profile: {profile}\nDriver: {driver}", + "tooltip": true, + "format-icons": { + "default": "", + "performance": "", + "balanced": "", + "power-saver": "" + } +}, "pulseaudio": { "format": "{icon} {volume}%", "format-bluetooth": "{icon} 󰂰 {volume}%", diff --git a/config/waybar/style/[Wallust Bordered] Chroma Simple (copy 1).css b/config/waybar/style/[Wallust Bordered] Chroma Simple (copy 1).css new file mode 100644 index 0000000..9475f41 --- /dev/null +++ b/config/waybar/style/[Wallust Bordered] Chroma Simple (copy 1).css @@ -0,0 +1,306 @@ +/* ----------- 💫 https://github.com/JaKooLit 💫 -------- */ +/* Wallust Bordered*/ + +@import '../../.config/waybar/wallust/colors-waybar.css'; + + +* { + font-family: "JetBrainsMono Nerd Font"; + font-weight: bold; + /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ + font-size: 97%; + min-height: 0; +} + +window#waybar { + background-color: transparent; + color: @foreground; + padding-left: 15px; + padding-right: 15px; +} + +window#waybar.empty #window { + background-color: transparent; + border-color: transparent; + padding-left: 15px; + padding-right: 15px; +} + +tooltip { + background-color: transparent; + color: @color12; + border-radius: 10px; + border-width: 1.5px; + border-style: solid; + border-color: @color9; + transition: 0.3s; + opacity: 0.9; +} + +#workspaces { + border-radius: 20px; + background: @background; + opacity: 1; + padding: 0px 10px; + margin: 0; + margin-top: 5px; + border: 2px solid @color12; +} + +#workspaces button { + color: @color10; + box-shadow: none; + text-shadow: none; + padding-right: 12px; + border-radius: 9px; + animation: gradient_f 20s ease-in infinite; + transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); +} + +#taskbar button.active, +#workspaces button.active { + color: @color12; + padding-right: 12px; + background-color: @background; + animation: gradient_f 20s ease-in infinite; + transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); +} + +#workspaces button.urgent { + color: #11111b; + border-radius: 10px; +} + +#taskbar button:hover, +#workspaces button:hover { + color: @color12; + padding-left: 0px; + padding-right: 2px; + animation: gradient_f 20s ease-in infinite; + transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); +} + +#backlight, +#backlight-slider, +#battery, +#bluetooth, +#clock, +#cpu, +#disk, +#idle_inhibitor, +#keyboard-state, +#memory, +#mode, +#network, +#pulseaudio, +#pulseaudio-slider, +#taskbar, +#temperature, +#tray, +#window, +#wireplumber, +#custom-backlight, +#custom-cava_mviz, +#custom-cycle_wall, +#custom-hint, +#custom-keyboard, +#custom-light_dark, +#custom-lock, +#custom-menu, +#custom-power_vertical, +#custom-power, +#custom-swaync, +#custom-updater, +#custom-weather, +#custom-weather.clearNight, +#custom-weather.cloudyFoggyDay, +#custom-weather.cloudyFoggyNight, +#custom-weather.default, +#custom-weather.rainyDay, +#custom-weather.rainyNight, +#custom-weather.severe, +#custom-weather.showyIcyDay, +#custom-weather.snowyIcyNight, +#custom-weather.sunnyDay { + border-radius: 20px; + background: @background; + opacity: 1; + padding: 0px 10px; + margin: 0; + margin-top: 5px; + border: 2px solid @color13; +} + +#cpu { + border: 2px solid @color5; + color: @color12; +} + +#memory { + color: @color10; +} + +#disk { + color: @color13; + border: 2px solid @color13; +} + +#temperature{ + color: @color11; +} + +#temperature.critical { + color: red; + border: 2px solid red; +} + +#custom-power { + color: red; + padding-left: 10px; + padding-right: 2px; + border: 2px solid red; +} + +#backlight { + color: #f9e2af; + padding-right: 5px; +} + +#tray { + border-radius: 20px; + margin-right: 5px; +/* padding: 0px 4px; */ + padding-left: 15px; + padding-right: 15px; + border: 2px solid @color7; +} + +#mpris { + padding-left: 15px; +} +#tray.empty { + background-color: transparent; + border-color: transparent; + border: 0px; +} + +#window { + margin-left: 5px; + margin-right: 5px; + border: 2px solid @color9; +} + +#clock { + color: #fab387; +} + +#network { + color: #a6adc8; + padding-right: 12px; + padding-left: 5px; + border: 2px solid @color10; +} + +#network.disconnected { + color: #f5c2e7; + border-left: 2px solid #a6e3a1; + border-top: 2px solid #a6e3a1; + border-right: 0px; + border-bottom: 2px solid @color10; +} + +#bluetooth { + color: #b4befe; + margin-right: 10px +} + +#pulseaudio.microphone, +#pulseaudio { + color: #89b4fa; + border: 2px solid @color13; +} + +#pulseaudio.muted { + color: #f38ba8; + padding-right: 20px; +} + +#battery { + color: #a6e3a1; + margin-right: 5px; + padding-right: 15px; + border: 2px solid @color14; +} + +#idle_inhibitor.activated { + color: @color12; + border: 2px solid @color12; +} + +#battery.good { + color: #ffd57a; + border: 2px solid @color15; +} + +#battery.warning { + color: #fab387; + border-left: 0px; + border: 2px solid @color12; +} + +#battery.charging { + color: #a6e3a1; +} + +#battery.critical { + color: #f38ba8; + border-left: 0px; + border: 2px solid @color8; +} + +#custom-weather { + color: #8eacf3; + border-right: 0px; + margin-left: 0px; + margin-right: 5px; +} + +#pulseaudio-slider slider { + min-width: 0px; + min-height: 0px; + opacity: 0; + background-image: none; + border: none; + box-shadow: none; +} + +#pulseaudio-slider trough { + min-width: 80px; + min-height: 5px; + border-radius: 5px; +} + +#pulseaudio-slider highlight { + min-height: 10px; + border-radius: 5px; +} + +#backlight-slider slider { + min-width: 0px; + min-height: 0px; + opacity: 0; + background-image: none; + border: none; + box-shadow: none; +} + +#backlight-slider trough { + min-width: 80px; + min-height: 10px; + border-radius: 5px; +} + +#backlight-slider highlight { + min-width: 10px; + border-radius: 5px; +} diff --git a/config/waybar/style/[Wallust Bordered] Chroma Simple.css b/config/waybar/style/[Wallust Bordered] Chroma Simple.css index 9475f41..4024c0b 100644 --- a/config/waybar/style/[Wallust Bordered] Chroma Simple.css +++ b/config/waybar/style/[Wallust Bordered] Chroma Simple.css @@ -92,6 +92,7 @@ tooltip { #memory, #mode, #network, +#power-profiles-daemon, #pulseaudio, #pulseaudio-slider, #taskbar, @@ -133,20 +134,24 @@ tooltip { #cpu { border: 2px solid @color5; - color: @color12; + color: @foreground; + background: @color12; } #memory { - color: @color10; + color: @foreground; + background: @color12; } #disk { - color: @color13; + color: @foreground; + background: @color12; border: 2px solid @color13; } #temperature{ - color: @color11; + color: @foreground; + background: @color12; } #temperature.critical { @@ -194,20 +199,6 @@ tooltip { color: #fab387; } -#network { - color: #a6adc8; - padding-right: 12px; - padding-left: 5px; - border: 2px solid @color10; -} - -#network.disconnected { - color: #f5c2e7; - border-left: 2px solid #a6e3a1; - border-top: 2px solid #a6e3a1; - border-right: 0px; - border-bottom: 2px solid @color10; -} #bluetooth { color: #b4befe; @@ -216,6 +207,7 @@ tooltip { #pulseaudio.microphone, #pulseaudio { + background-color: @color12; color: #89b4fa; border: 2px solid @color13; } diff --git a/config/waybar/wallust/colors-waybar.css b/config/waybar/wallust/colors-waybar.css index a9c7090..8a28025 100644 --- a/config/waybar/wallust/colors-waybar.css +++ b/config/waybar/wallust/colors-waybar.css @@ -1,20 +1,20 @@ -@define-color foreground #D1F8FD; -@define-color background rgba(6,4,2,0.25); -@define-color cursor #D1F8FD; +@define-color foreground #FDF1E6; +@define-color background rgba(1,4,7,0.25); +@define-color cursor #FDF1E6; -@define-color color0 #060402; -@define-color color1 #7A6835; -@define-color color2 #677762; -@define-color color3 #2586B5; -@define-color color4 #998C72; -@define-color color5 #94A7B8; -@define-color color6 #5CB1BC; -@define-color color7 #B5EDF4; -@define-color color8 #7EA6AB; -@define-color color9 #A38A46; -@define-color color10 #899F83; -@define-color color11 #31B2F1; -@define-color color12 #CCBA98; -@define-color color13 #C6DEF5; -@define-color color14 #7BECFA; -@define-color color15 #B5EDF4; +@define-color color0 #010407; +@define-color color1 #6F2229; +@define-color color2 #5B4E57; +@define-color color3 #A63D3A; +@define-color color4 #1B6C77; +@define-color color5 #9B6F77; +@define-color color6 #BBA189; +@define-color color7 #F4E2D3; +@define-color color8 #AA9E93; +@define-color color9 #942D37; +@define-color color10 #7A6874; +@define-color color11 #DE514D; +@define-color color12 #24909F; +@define-color color13 #CF949F; +@define-color color14 #F9D6B7; +@define-color color15 #F4E2D3;