From b850b78adbf170132cb58213b311023c93be7646 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 19 Feb 2025 19:41:07 +0900 Subject: bumping to v2.3.12 --- config/hypr/scripts/WaybarLayout.sh | 4 +- config/hypr/scripts/WaybarStyles.sh | 3 +- config/hypr/v2.3.11 | 5 - config/hypr/v2.3.12 | 5 + config/rofi/config-wallpaper.rasi | 13 +- config/rofi/config-waybar-layout.rasi | 6 +- config/rofi/config-waybar-style.rasi | 2 +- config/waybar/ModulesCustom | 2 +- config/waybar/ModulesGroups | 16 ++ config/waybar/configs/[LEFT] WestWing | 43 ++++ config/waybar/configs/[LEFT] WestWing v2 | 61 ++++++ config/waybar/configs/[Left] WestWing | 43 ---- config/waybar/configs/[RIGHT] EastWing | 43 ++++ config/waybar/configs/[RIGHT] EastWing v2 | 61 ++++++ config/waybar/configs/[Right] EastWing | 43 ---- .../waybar/style/[VERTICAL] [Catpuccin] Mocha.css | 222 +++++++++++++++++++++ 16 files changed, 467 insertions(+), 105 deletions(-) delete mode 100644 config/hypr/v2.3.11 create mode 100644 config/hypr/v2.3.12 create mode 100644 config/waybar/configs/[LEFT] WestWing create mode 100644 config/waybar/configs/[LEFT] WestWing v2 delete mode 100644 config/waybar/configs/[Left] WestWing create mode 100644 config/waybar/configs/[RIGHT] EastWing create mode 100644 config/waybar/configs/[RIGHT] EastWing v2 delete mode 100644 config/waybar/configs/[Right] EastWing create mode 100644 config/waybar/style/[VERTICAL] [Catpuccin] Mocha.css diff --git a/config/hypr/scripts/WaybarLayout.sh b/config/hypr/scripts/WaybarLayout.sh index 33f31842..604ec3af 100755 --- a/config/hypr/scripts/WaybarLayout.sh +++ b/config/hypr/scripts/WaybarLayout.sh @@ -9,6 +9,7 @@ waybar_layouts="$HOME/.config/waybar/configs" waybar_config="$HOME/.config/waybar/config" SCRIPTSDIR="$HOME/.config/hypr/scripts" rofi_config="$HOME/.config/rofi/config-waybar-layout.rasi" +msg=' 🎌 NOTE: Some waybar LAYOUT NOT fully compatible with some STYLES' # Function to display menu options menu() { @@ -23,13 +24,12 @@ menu() { # Apply selected configuration apply_config() { ln -sf "$waybar_layouts/$1" "$waybar_config" - #restart_waybar_if_needed "${SCRIPTSDIR}/Refresh.sh" & } # Main function main() { - choice=$(menu | rofi -i -dmenu -config "$rofi_config") + choice=$(menu | rofi -i -dmenu -config "$rofi_config" -mesg "$msg") if [[ -z "$choice" ]]; then echo "No option selected. Exiting." diff --git a/config/hypr/scripts/WaybarStyles.sh b/config/hypr/scripts/WaybarStyles.sh index a265eae0..5cba7d6a 100755 --- a/config/hypr/scripts/WaybarStyles.sh +++ b/config/hypr/scripts/WaybarStyles.sh @@ -9,6 +9,7 @@ waybar_styles="$HOME/.config/waybar/style" waybar_style="$HOME/.config/waybar/style.css" SCRIPTSDIR="$HOME/.config/hypr/scripts" rofi_config="$HOME/.config/rofi/config-waybar-style.rasi" +msg=' 🎌 NOTE: Some waybar STYLES NOT fully compatible with some LAYOUTS' # Function to display menu options menu() { @@ -30,7 +31,7 @@ apply_style() { # Main function main() { - choice=$(menu | rofi -i -dmenu -config "$rofi_config") + choice=$(menu | rofi -i -dmenu -config "$rofi_config" -mesg "$msg") if [[ -z "$choice" ]]; then echo "No option selected. Exiting." diff --git a/config/hypr/v2.3.11 b/config/hypr/v2.3.11 deleted file mode 100644 index 31b3414d..00000000 --- a/config/hypr/v2.3.11 +++ /dev/null @@ -1,5 +0,0 @@ -### https://github.com/JaKooLit ### -## https://github.com/JaKooLit/Hyprland-Dots -## This is to have a reference of which version would be - -## note that this will always be higher than the released versions \ No newline at end of file diff --git a/config/hypr/v2.3.12 b/config/hypr/v2.3.12 new file mode 100644 index 00000000..31b3414d --- /dev/null +++ b/config/hypr/v2.3.12 @@ -0,0 +1,5 @@ +### https://github.com/JaKooLit ### +## https://github.com/JaKooLit/Hyprland-Dots +## This is to have a reference of which version would be + +## note that this will always be higher than the released versions \ No newline at end of file diff --git a/config/rofi/config-wallpaper.rasi b/config/rofi/config-wallpaper.rasi index ca2789d8..758370b7 100644 --- a/config/rofi/config-wallpaper.rasi +++ b/config/rofi/config-wallpaper.rasi @@ -9,7 +9,7 @@ configuration { } window { - width: 60%; + width: 75%; } /* ---- Mainbox ---- */ @@ -26,10 +26,10 @@ entry { /* ---- Listview ---- */ listview { - columns: 4; + columns: 6; lines: 2; - spacing: 10px; - padding: 10px; + spacing: 40px; + padding: 20px; flow: horizontal; fixed-width: false; fixed-height: true; @@ -38,17 +38,18 @@ listview { /* ---- Element ---- */ element { orientation: vertical; - border-radius: 12px; + border-radius: inherit; spacing: 20px; padding: 6px; } element-icon { vertical-align: 0.5; + margin: -110px -10px; } element-text { - vertical-align: 1.0; + vertical-align: 0.5; horizontal-align: 0.5; padding: 0px; margin: 0px; diff --git a/config/rofi/config-waybar-layout.rasi b/config/rofi/config-waybar-layout.rasi index be9d5ac5..4cfbd3cc 100644 --- a/config/rofi/config-waybar-layout.rasi +++ b/config/rofi/config-waybar-layout.rasi @@ -6,7 +6,7 @@ /* ---- Mainbox ---- */ mainbox { children: - [ "inputbar", "listview"]; + [ "inputbar", "message", "listview"]; } /* ---- Configuration ---- */ @@ -22,7 +22,7 @@ window { /* ---- Entry ---- */ entry { expand: true; - placeholder: " 🖼️ Search / Choose Waybar Layout"; + placeholder: " 🖼️ Search / Choose Waybar Layout"; } /* ---- Listview ---- */ @@ -41,4 +41,4 @@ element-icon { element-text { horizontal-align: 0.0; margin: 5px 30px 5px 30px; -} +} \ No newline at end of file diff --git a/config/rofi/config-waybar-style.rasi b/config/rofi/config-waybar-style.rasi index 67954bff..9a11be8d 100644 --- a/config/rofi/config-waybar-style.rasi +++ b/config/rofi/config-waybar-style.rasi @@ -6,7 +6,7 @@ /* ---- Mainbox ---- */ mainbox { children: - [ "inputbar", "listview"]; + [ "inputbar", "message", "listview"]; } /* ---- Configuration ---- */ diff --git a/config/waybar/ModulesCustom b/config/waybar/ModulesCustom index fe00d254..ba9c77ba 100644 --- a/config/waybar/ModulesCustom +++ b/config/waybar/ModulesCustom @@ -133,7 +133,7 @@ }, "custom/power": { - "format": "⏻ ", + "format": " ⏻ ", "on-click": "$HOME/.config/hypr/scripts/Wlogout.sh", "on-click-right": "$HOME/.config/hypr/scripts/ChangeBlur.sh", "tooltip": true, diff --git a/config/waybar/ModulesGroups b/config/waybar/ModulesGroups index 6bc7cea4..179a91ba 100644 --- a/config/waybar/ModulesGroups +++ b/config/waybar/ModulesGroups @@ -106,4 +106,20 @@ "custom/dot_update", ] }, + +// groups for vertical +"group/power#vert": { + "orientation": "inherit", + "drawer": { + "transition-duration": 300, + "children-class": "not-memory", + "transition-left-to-right": false + }, + "modules": [ + "custom/power", + "custom/lock", + "custom/logout", + "custom/reboot" + ] +}, } \ No newline at end of file diff --git a/config/waybar/configs/[LEFT] WestWing b/config/waybar/configs/[LEFT] WestWing new file mode 100644 index 00000000..0c4218c3 --- /dev/null +++ b/config/waybar/configs/[LEFT] WestWing @@ -0,0 +1,43 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### LEFT PANEL ### // + +{ +"include": [ + "$HOME/.config/waybar/Modules", + "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", + "$HOME/.config/waybar/ModulesVertical", + ], +"layer": "top", +"position": "left", +"margin-top": 8, +"margin-bottom": 8, +"margin-left": 3, +//"margin-right": 3, +"spacing": 3, +"fixed-center": true, +"ipc": true, +//"gtk-layer-shell": true, + +"modules-left": [ + "clock#vertical", + "custom/light_dark", +], + +"modules-center": [ + "hyprland/workspaces", +], + +"modules-right": [ + "mpris", + "tray", + "group/notify", + "backlight#vertical", + "pulseaudio#microphone_vertical", + "pulseaudio#vertical", + "custom/power_vertical", + "custom/menu", +], +} diff --git a/config/waybar/configs/[LEFT] WestWing v2 b/config/waybar/configs/[LEFT] WestWing v2 new file mode 100644 index 00000000..e5e2fca4 --- /dev/null +++ b/config/waybar/configs/[LEFT] WestWing v2 @@ -0,0 +1,61 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### LEFT PANEL ### // + +{ +"include": [ + "$HOME/.config/waybar/Modules", + "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", + "$HOME/.config/waybar/ModulesVertical", + ], +"layer": "top", +"position": "left", +"margin-top": 8, +"margin-bottom": 8, +"margin-left": 3, +//"margin-right": 3, +"spacing": 3, +"fixed-center": true, +"ipc": true, +//"gtk-layer-shell": true, + +"modules-left": [ + "group/notify", + "clock#vertical", + + "custom/menu", +], + +"modules-center": [ + "hyprland/workspaces", +], + +"modules-right": [ + "mpris", + "tray", + "backlight#vertical", + "pulseaudio/slider", + "pulseaudio#microphone_vertical", + "group/power#vert", +], + + +// Additional modules // +"pulseaudio/slider": { + "min": 0, + "max": 100, + "orientation": "vertical", + "tooltip": "true", + "tooltip-format": "{icon} {desc} | {volume}%", + +}, +"backlight/slider": { + "min": 0, + "max": 100, + "orientation": "vertical", + "device": "intel_backlight" +}, + +} \ No newline at end of file diff --git a/config/waybar/configs/[Left] WestWing b/config/waybar/configs/[Left] WestWing deleted file mode 100644 index 0c4218c3..00000000 --- a/config/waybar/configs/[Left] WestWing +++ /dev/null @@ -1,43 +0,0 @@ -/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ - -// ### LEFT PANEL ### // - -{ -"include": [ - "$HOME/.config/waybar/Modules", - "$HOME/.config/waybar/ModulesWorkspaces", - "$HOME/.config/waybar/ModulesCustom", - "$HOME/.config/waybar/ModulesGroups", - "$HOME/.config/waybar/ModulesVertical", - ], -"layer": "top", -"position": "left", -"margin-top": 8, -"margin-bottom": 8, -"margin-left": 3, -//"margin-right": 3, -"spacing": 3, -"fixed-center": true, -"ipc": true, -//"gtk-layer-shell": true, - -"modules-left": [ - "clock#vertical", - "custom/light_dark", -], - -"modules-center": [ - "hyprland/workspaces", -], - -"modules-right": [ - "mpris", - "tray", - "group/notify", - "backlight#vertical", - "pulseaudio#microphone_vertical", - "pulseaudio#vertical", - "custom/power_vertical", - "custom/menu", -], -} diff --git a/config/waybar/configs/[RIGHT] EastWing b/config/waybar/configs/[RIGHT] EastWing new file mode 100644 index 00000000..dac579a9 --- /dev/null +++ b/config/waybar/configs/[RIGHT] EastWing @@ -0,0 +1,43 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### RIGHT PANEL ### // + +{ +"include": [ + "$HOME/.config/waybar/Modules", + "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", + "$HOME/.config/waybar/ModulesVertical", + ], +"layer": "top", +"position": "right", +"margin-top": 8, +"margin-bottom": 8, +//"margin-left": 3, +"margin-right": 3, +"spacing": 3, +"fixed-center": true, +"ipc": true, +//"gtk-layer-shell": true, + +"modules-left": [ + "clock#vertical", + "custom/light_dark", +], + +"modules-center": [ + "hyprland/workspaces", +], + +"modules-right": [ + "mpris", + "tray", + "group/notify", + "backlight#vertical", + "pulseaudio#microphone_vertical", + "pulseaudio#vertical", + "custom/power_vertical", + "custom/menu", +], +} diff --git a/config/waybar/configs/[RIGHT] EastWing v2 b/config/waybar/configs/[RIGHT] EastWing v2 new file mode 100644 index 00000000..e2dfb9b0 --- /dev/null +++ b/config/waybar/configs/[RIGHT] EastWing v2 @@ -0,0 +1,61 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### LEFT PANEL ### // + +{ +"include": [ + "$HOME/.config/waybar/Modules", + "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", + "$HOME/.config/waybar/ModulesVertical", + ], +"layer": "top", +"position": "right", +"margin-top": 8, +"margin-bottom": 8, +"margin-left": 3, +//"margin-right": 3, +"spacing": 3, +"fixed-center": true, +"ipc": true, +//"gtk-layer-shell": true, + +"modules-left": [ + "group/notify", + "clock#vertical", + + "custom/menu", +], + +"modules-center": [ + "hyprland/workspaces", +], + +"modules-right": [ + "mpris", + "tray", + "backlight#vertical", + "pulseaudio/slider", + "pulseaudio#microphone_vertical", + "group/power#vert", +], + + +// Additional modules // +"pulseaudio/slider": { + "min": 0, + "max": 100, + "orientation": "vertical", + "tooltip": "true", + "tooltip-format": "{icon} {desc} | {volume}%", + +}, +"backlight/slider": { + "min": 0, + "max": 100, + "orientation": "vertical", + "device": "intel_backlight" +}, + +} \ No newline at end of file diff --git a/config/waybar/configs/[Right] EastWing b/config/waybar/configs/[Right] EastWing deleted file mode 100644 index dac579a9..00000000 --- a/config/waybar/configs/[Right] EastWing +++ /dev/null @@ -1,43 +0,0 @@ -/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ - -// ### RIGHT PANEL ### // - -{ -"include": [ - "$HOME/.config/waybar/Modules", - "$HOME/.config/waybar/ModulesWorkspaces", - "$HOME/.config/waybar/ModulesCustom", - "$HOME/.config/waybar/ModulesGroups", - "$HOME/.config/waybar/ModulesVertical", - ], -"layer": "top", -"position": "right", -"margin-top": 8, -"margin-bottom": 8, -//"margin-left": 3, -"margin-right": 3, -"spacing": 3, -"fixed-center": true, -"ipc": true, -//"gtk-layer-shell": true, - -"modules-left": [ - "clock#vertical", - "custom/light_dark", -], - -"modules-center": [ - "hyprland/workspaces", -], - -"modules-right": [ - "mpris", - "tray", - "group/notify", - "backlight#vertical", - "pulseaudio#microphone_vertical", - "pulseaudio#vertical", - "custom/power_vertical", - "custom/menu", -], -} diff --git a/config/waybar/style/[VERTICAL] [Catpuccin] Mocha.css b/config/waybar/style/[VERTICAL] [Catpuccin] Mocha.css new file mode 100644 index 00000000..964a7774 --- /dev/null +++ b/config/waybar/style/[VERTICAL] [Catpuccin] Mocha.css @@ -0,0 +1,222 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ +/* Vertical Catpuccin Mocha */ +/* As stated on title, best style for vertical layout waybar config */ + +* { + font-family: "JetBrainsMono Nerd Font"; + font-weight: bold; + min-height: 0; + /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */ + font-size: 97%; + font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; +} + +@import "../waybar/style/catppuccin-themes/mocha.css"; + +window#waybar { + background-color: @base; + border-radius: 5px; +} + +tooltip { + background: @base; + opacity: 1; + border-radius: 10px; + border-width: 2px; + border-style: solid; + border-color: @sapphire; +} + +tooltip label { + color: @blue; +} + +#taskbar button, +#workspaces button { + color: @surface2; + background-color: transparent; + padding-top: 4px; + padding-bottom: 4px; + padding-right: 6px; + padding-left: 4px; +} + +#taskbar button.active, +#workspaces button.active { + color: @maroon; +} + +#taskbar button.focused, +#workspaces button.focused { + color: @rosewater; + background: transparent; + border-radius: 15px; +} + +#workspaces button.urgent { + color: #11111b; + background: transparent; + border-radius: 15px; +} + +#taskbar button:hover, +#workspaces button:hover { + background: transparent; + color: @flamingo; + border-radius: 15px; +} + +#backlight, +#backlight-slider, +#battery, +#bluetooth, +#clock, +#cpu, +#disk, +#idle_inhibitor, +#keyboard-state, +#memory, +#mode, +#mpris, +#network, +#power-profiles-daemon, +#pulseaudio, +#pulseaudio-slider, +#taskbar button, +#taskbar, +#temperature, +#tray, +#window, +#wireplumber, +#workspaces, +#custom-backlight, +#custom-browser, +#custom-cava_mviz, +#custom-cycle_wall, +#custom-dot_update, +#custom-file_manager, +#custom-keybinds, +#custom-keyboard, +#custom-light_dark, +#custom-lock, +#custom-hint, +#custom-hypridle, +#custom-menu, +#custom-playerctl, +#custom-power_vertical, +#custom-power, +#custom-settings, +#custom-spotify, +#custom-swaync, +#custom-tty, +#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 { + opacity: 1; + padding-top: 4px; + padding-bottom: 4px; + padding-right: 6px; + padding-left: 6px; +} + +#idle_inhibitor { + color: @pink; +} + +#mpris { + color: @rosewater; +} + +#battery { + color: #a6e3a1; + padding-left: 15px; + border-radius: 15px 0 0 15px; +} + +@keyframes blink { + to { + background-color: #ffffff; + color: #333333; + } +} + +#battery.critical:not(.charging) { + color: #f53c3c; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; +} + +#custom-lock, +#custom-power { + color: @red; + border-radius: 15px; + font-weight: bolder; + padding-left: 1px; +} + +#network { + background-color: transparent; + color: @mauve; +} + +#backlight { + color: @flamingo; +} + + +#custom-weather { + color: @green; + border-radius: 15px; + background-color: transparent; +} + +#custom-menu { + color: #89b4fa; +} + +#pulseaudio { + background-color: transparent; + color: @blue; +} + +#clock, +#clock-calender { + color: @sapphire; +} + +#backlight-slider slider, +#pulseaudio-slider slider { + min-height: 7px; + min-width: 15px; + opacity: 0; + background-color: @text; + border-radius: 3px; + box-shadow: 1px 5px 6px 1px #272727; +} + +#backlight-slider trough, +#pulseaudio-slider trough { + min-height: 100px; + min-width: 7px; + border-radius: 5px; + background-color: @surface0; +} + +#backlight-slider highlight, +#pulseaudio-slider highlight { + min-width: 5px; + border-radius: 5px; + background-color: @blue; +} -- cgit v1.2.3