From c6af0236df40439f030e9145f2fa18d1d40ff031 Mon Sep 17 00:00:00 2001 From: S4NKALP Date: Tue, 7 May 2024 21:56:30 +0545 Subject: [PATCH] using one waybar layout now --- config/hypr/UserConfigs/UserKeybinds.conf | 2 +- config/hypr/scripts/Ui_cmd.sh | 56 ++-- config/hypr/scripts/Xmenu.sh | 2 +- config/waybar/config | 40 ++- .../waybar/{ => old}/configs/[BOT] camellia | 0 config/waybar/{ => old}/configs/[BOT] default | 0 .../waybar/{ => old}/configs/[BOT] gardenia | 0 config/waybar/{ => old}/configs/[BOT] peony | 0 config/waybar/{ => old}/configs/[BOT] sleek | 0 .../{ => old}/configs/[TOP & BOT] summitsplit | 0 config/waybar/{ => old}/configs/[TOP] default | 0 .../{ => old}/configs/[TOP] minimal - long | 0 .../{ => old}/configs/[TOP] minimal - short | 0 config/waybar/{ => old}/configs/[TOP] sleek | 0 config/waybar/old/style.css | 257 ++++++++++++++++++ config/waybar/style.css | 168 +++++------- 16 files changed, 395 insertions(+), 130 deletions(-) mode change 120000 => 100644 config/waybar/config rename config/waybar/{ => old}/configs/[BOT] camellia (100%) rename config/waybar/{ => old}/configs/[BOT] default (100%) rename config/waybar/{ => old}/configs/[BOT] gardenia (100%) rename config/waybar/{ => old}/configs/[BOT] peony (100%) rename config/waybar/{ => old}/configs/[BOT] sleek (100%) rename config/waybar/{ => old}/configs/[TOP & BOT] summitsplit (100%) rename config/waybar/{ => old}/configs/[TOP] default (100%) rename config/waybar/{ => old}/configs/[TOP] minimal - long (100%) rename config/waybar/{ => old}/configs/[TOP] minimal - short (100%) rename config/waybar/{ => old}/configs/[TOP] sleek (100%) create mode 100644 config/waybar/old/style.css diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf index 53d30989..895f3739 100644 --- a/config/hypr/UserConfigs/UserKeybinds.conf +++ b/config/hypr/UserConfigs/UserKeybinds.conf @@ -57,7 +57,7 @@ bind = ALT, R, exec, $RunCMD music -k # Resume # Waybar / Bar related bind = $mainMod, H, exec, killall -SIGUSR1 waybar -bind = ALT, W, exec, $RunCMD waybar_layout +#bind = ALT, W, exec, $RunCMD waybar_layout # ScreenShot diff --git a/config/hypr/scripts/Ui_cmd.sh b/config/hypr/scripts/Ui_cmd.sh index a1bd90f4..0fae7d60 100755 --- a/config/hypr/scripts/Ui_cmd.sh +++ b/config/hypr/scripts/Ui_cmd.sh @@ -163,34 +163,34 @@ select_wall() { # # ###################################### -waybar_layout() { - menu() { - find "$config_dir" -maxdepth 1 -type f -exec basename {} \; | sort - } - apply_config() { - ln -sf "$config_dir/$1" "$waybar_config" - restart_waybar_if_needed - } -restart_waybar_if_needed() { - if pgrep -x "waybar" >/dev/null; then - pkill waybar - sleep 0.1 - fi - $RunCMD reload_waybar & -} - main() { - choice=$(menu | rofi -dmenu -p "  Choose Waybar Layout") - - [[ -z "$choice" ]] && { echo "No option selected. Exiting."; exit 0; } - - case $choice in - "no panel") pkill -x waybar || true ;; - *) apply_config "$choice" ;; - esac - } - pgrep -x rofi && { pkill rofi; exit 0; } - main -} +#waybar_layout() { +# menu() { +# find "$config_dir" -maxdepth 1 -type f -exec basename {} \; | sort +# } +# apply_config() { +# ln -sf "$config_dir/$1" "$waybar_config" +# restart_waybar_if_needed +# } +#restart_waybar_if_needed() { +# if pgrep -x "waybar" >/dev/null; then +# pkill waybar +# sleep 0.1 +# fi +# $RunCMD reload_waybar & +#} +# main() { +# choice=$(menu | rofi -dmenu -p "  Choose Waybar Layout") +# +# [[ -z "$choice" ]] && { echo "No option selected. Exiting."; exit 0; } +# +# case $choice in +# "no panel") pkill -x waybar || true ;; +# *) apply_config "$choice" ;; +# esac +# } +# pgrep -x rofi && { pkill rofi; exit 0; } +# main +#} ###################################### # # diff --git a/config/hypr/scripts/Xmenu.sh b/config/hypr/scripts/Xmenu.sh index b2569a2d..46be796a 100755 --- a/config/hypr/scripts/Xmenu.sh +++ b/config/hypr/scripts/Xmenu.sh @@ -12,7 +12,7 @@ declare -A menu_options=( #waybar ["wbt ToggleWaybar"]="killall -SIGUSR1 waybar" - ["wbl WaybarLayout"]="$RunCMD waybar_layout" + #["wbl WaybarLayout"]="$RunCMD waybar_layout" ["wbr Reload Waybar"]="$RunCMD reload_waybar" ["wbu Update Waybar"]="$RunCMD update_waybar" #hypr diff --git a/config/waybar/config b/config/waybar/config deleted file mode 120000 index ea6a7a41..00000000 --- a/config/waybar/config +++ /dev/null @@ -1 +0,0 @@ -/home/sankalp/dotfiles/waybar/configs/[TOP & BOT] summitsplit \ No newline at end of file diff --git a/config/waybar/config b/config/waybar/config new file mode 100644 index 00000000..96815a8e --- /dev/null +++ b/config/waybar/config @@ -0,0 +1,39 @@ + +{ + +"include": "~/dotfiles/waybar/modules", +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "bottom", +"fixed-center": true, +"ipc": true, + +"modules-left": [ + "hyprland/workspaces#4", + "custom/separator#line", + "mpris", + "tray", + "hyprland/window"], + +"modules-center": ["idle_inhibitor","group/motherboard", ], + +"modules-right": [ + "group/audio", + "group/laptop", + "clock#1", + "custom/swaync", + ], + +// Additional modules // + + +"clock#1": { + "format": "{:%I:%M %p - %d/%b}", //for AM/PM + //"format": "{:%H:%M - %d/%b}", // 24H + "tooltip": false + +}, + +} diff --git a/config/waybar/configs/[BOT] camellia b/config/waybar/old/configs/[BOT] camellia similarity index 100% rename from config/waybar/configs/[BOT] camellia rename to config/waybar/old/configs/[BOT] camellia diff --git a/config/waybar/configs/[BOT] default b/config/waybar/old/configs/[BOT] default similarity index 100% rename from config/waybar/configs/[BOT] default rename to config/waybar/old/configs/[BOT] default diff --git a/config/waybar/configs/[BOT] gardenia b/config/waybar/old/configs/[BOT] gardenia similarity index 100% rename from config/waybar/configs/[BOT] gardenia rename to config/waybar/old/configs/[BOT] gardenia diff --git a/config/waybar/configs/[BOT] peony b/config/waybar/old/configs/[BOT] peony similarity index 100% rename from config/waybar/configs/[BOT] peony rename to config/waybar/old/configs/[BOT] peony diff --git a/config/waybar/configs/[BOT] sleek b/config/waybar/old/configs/[BOT] sleek similarity index 100% rename from config/waybar/configs/[BOT] sleek rename to config/waybar/old/configs/[BOT] sleek diff --git a/config/waybar/configs/[TOP & BOT] summitsplit b/config/waybar/old/configs/[TOP & BOT] summitsplit similarity index 100% rename from config/waybar/configs/[TOP & BOT] summitsplit rename to config/waybar/old/configs/[TOP & BOT] summitsplit diff --git a/config/waybar/configs/[TOP] default b/config/waybar/old/configs/[TOP] default similarity index 100% rename from config/waybar/configs/[TOP] default rename to config/waybar/old/configs/[TOP] default diff --git a/config/waybar/configs/[TOP] minimal - long b/config/waybar/old/configs/[TOP] minimal - long similarity index 100% rename from config/waybar/configs/[TOP] minimal - long rename to config/waybar/old/configs/[TOP] minimal - long diff --git a/config/waybar/configs/[TOP] minimal - short b/config/waybar/old/configs/[TOP] minimal - short similarity index 100% rename from config/waybar/configs/[TOP] minimal - short rename to config/waybar/old/configs/[TOP] minimal - short diff --git a/config/waybar/configs/[TOP] sleek b/config/waybar/old/configs/[TOP] sleek similarity index 100% rename from config/waybar/configs/[TOP] sleek rename to config/waybar/old/configs/[TOP] sleek diff --git a/config/waybar/old/style.css b/config/waybar/old/style.css new file mode 100644 index 00000000..abc7dde4 --- /dev/null +++ b/config/waybar/old/style.css @@ -0,0 +1,257 @@ +* { + font-family: "JetBrains Mono 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"'; + padding: 1px; +} + +/*dracula-themes*/ +@define-color background-darker rgba(30, 31, 41, 230); +@define-color background #282a36; +@define-color selection #44475a; +@define-color foreground #f8f8f2; +@define-color comment #6272a4; +@define-color cyan #8be9fd; +@define-color green #50fa7b; +@define-color orange #ffb86c; +@define-color pink #ff79c6; +@define-color purple #bd93f9; +@define-color red #ff5555; +@define-color yellow #f1fa8c; +@define-color blue #6272a4; + +window#waybar { + background: transparent; +} + +window#waybar.hidden { + opacity: 0.5; +} + +window#waybar.empty { + background-color: transparent; +} + +window#waybar.empty #window { + padding: 0px; + border: 0px; + /* background-color: rgba(66,66,66,0.5); */ + /* transparent */ + background-color: transparent; +} + +tooltip { + background: #1e1e2e; + border-radius: 10px; + border-width: 2px; + border-style: solid; + border-color: #11111b; + color: #cba6f7; +} + +/*-----module groups----*/ +.modules-right { + border: 3px solid @purple; + border-radius: 100px 0px 0px 0px; + background-color: @background-darker; + padding-top: 2px; + padding-bottom: 2px; + padding-right: 4px; + padding-left: 4px; +} + +.modules-center { + border: 3px solid @purple; + background-color: @background-darker; + border-radius: 60px 0px 60px 0px; + padding-top: 2px; + padding-bottom: 2px; + padding-right: 4px; + padding-left: 4px; + + +} + +.modules-left { + border: 3px solid @purple; + border-radius: 0px 0px 100px 0px; + background-color: @background-darker; + padding-top: 2px; + padding-bottom: 2px; + padding-right: 4px; + padding-left: 4px; +} + +#workspaces button { + color: @blue; + box-shadow: none; + text-shadow: none; + padding: 0px; + border-radius: 9px; + padding-left: 0px; + padding-right: 0px; + animation: gradient_f 20s ease-in infinite; + transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); +} + +#workspaces button.active { + color: @yellow; + border-radius: 50%; + background-color: black; + padding-left: 0px; + padding-right: 0px; + animation: gradient_f 20s ease-in infinite; + transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); +} + +#workspaces button.focused { + color: @orange; +} + +#workspaces button.urgent { + color: @red; + border-radius: 10px; +} + +#workspaces button:hover { + color: @cyan; + border-radius: 15px; + padding-left: 0px; + padding-right: 0px; + 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, +#mpris, +#network, +#pulseaudio, +#pulseaudio-slider, +#taskbar, +#temperature, +#tray, +#window, +#wireplumber, +#workspaces, +#custom-backlight, +#custom-cava_mviz, +#custom-cycle_wall, +#custom-keybinds, +#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 { + color: whitesmoke; + padding-top: 1px; + padding-bottom: 1px; + padding-right: 6px; + padding-left: 6px; + +} + +#temperature.critical { + background-color: @red; +} + +@keyframes blink { + to { + color: #000000; + } +} + +#taskbar button.active { + background-color: black; + border-radius: 30px; + padding-left: 0px; + padding-right: 0px; + animation: gradient_f 20s ease-in infinite; + transition: all 0.1s cubic-bezier(.55,-0.68,.48,1.682); +} + +#taskbar button:hover { + padding-left: 0px; + padding-right: 0px; + animation: gradient_f 20s ease-in infinite; + transition: all 0.1s cubic-bezier(.55,-0.68,.48,1.682); +} + +#battery.critical:not(.charging) { + color: #f53c3c; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; +} + +#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; + background-color: #6E6A86; +} + +#pulseaudio-slider highlight { + min-height: 10px; + border-radius: 5px; + background-color: @selection; +} + +#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; + background-color: #6E6A86; +} + +#backlight-slider highlight { + min-width: 10px; + border-radius: 5px; + background-color: @selection; +} diff --git a/config/waybar/style.css b/config/waybar/style.css index abc7dde4..48ad3f89 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -1,130 +1,104 @@ -* { - font-family: "JetBrains Mono 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"'; - padding: 1px; -} +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ +/* Black & White MonoChrome */ -/*dracula-themes*/ -@define-color background-darker rgba(30, 31, 41, 230); -@define-color background #282a36; -@define-color selection #44475a; -@define-color foreground #f8f8f2; -@define-color comment #6272a4; -@define-color cyan #8be9fd; -@define-color green #50fa7b; -@define-color orange #ffb86c; -@define-color pink #ff79c6; -@define-color purple #bd93f9; -@define-color red #ff5555; -@define-color yellow #f1fa8c; -@define-color blue #6272a4; +* { +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"'; +padding: 1px; +} window#waybar { background: transparent; } -window#waybar.hidden { - opacity: 0.5; -} - window#waybar.empty { background-color: transparent; } window#waybar.empty #window { - padding: 0px; - border: 0px; - /* background-color: rgba(66,66,66,0.5); */ - /* transparent */ background-color: transparent; } tooltip { + color: white; background: #1e1e2e; + opacity: 0.8; border-radius: 10px; border-width: 2px; border-style: solid; - border-color: #11111b; - color: #cba6f7; + border-color: white; } +tooltip label{ + color: #cdd6f4; +} /*-----module groups----*/ .modules-right { - border: 3px solid @purple; - border-radius: 100px 0px 0px 0px; - background-color: @background-darker; + background-color: black; + color: white; + border-bottom: 1px; + border-style: solid; + border-color: white; + border-radius: 10px; padding-top: 2px; padding-bottom: 2px; padding-right: 4px; padding-left: 4px; } - .modules-center { - border: 3px solid @purple; - background-color: @background-darker; - border-radius: 60px 0px 60px 0px; + background-color: black; + color: white; + border-bottom: 1px; + border-style: solid; + border-color: white; + border-radius: 10px; padding-top: 2px; padding-bottom: 2px; padding-right: 4px; padding-left: 4px; - - } - .modules-left { - border: 3px solid @purple; - border-radius: 0px 0px 100px 0px; - background-color: @background-darker; + background-color: black; + color: white; + border-bottom: 1px; + border-style: solid; + border-color: white; + border-radius: 10px; padding-top: 2px; padding-bottom: 2px; padding-right: 4px; padding-left: 4px; } - +/*-----modules indv----*/ #workspaces button { - color: @blue; box-shadow: none; - text-shadow: none; + text-shadow: none; padding: 0px; border-radius: 9px; padding-left: 0px; padding-right: 0px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); +} +#workspaces button:hover { + color: white; + background-color: rgba(0,153,153,0.2); + padding-left: 0px; + padding-right: 0px; } #workspaces button.active { - color: @yellow; - border-radius: 50%; - background-color: black; + color: #ff5555; padding-left: 0px; padding-right: 0px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } -#workspaces button.focused { - color: @orange; -} - -#workspaces button.urgent { - color: @red; +#workspaces button.persistent { border-radius: 10px; } -#workspaces button:hover { - color: @cyan; - border-radius: 15px; - padding-left: 0px; - padding-right: 0px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - #backlight, #backlight-slider, #battery, @@ -147,9 +121,8 @@ tooltip { #wireplumber, #workspaces, #custom-backlight, -#custom-cava_mviz, #custom-cycle_wall, -#custom-keybinds, +#custom-hint, #custom-keyboard, #custom-light_dark, #custom-lock, @@ -169,16 +142,20 @@ tooltip { #custom-weather.showyIcyDay, #custom-weather.snowyIcyNight, #custom-weather.sunnyDay { - color: whitesmoke; - padding-top: 1px; - padding-bottom: 1px; + padding-top: 3px; + padding-bottom: 3px; padding-right: 6px; padding-left: 6px; - } - +/*-----Indicators----*/ +#idle_inhibitor.activated { + color: #2dcc36; +} +#pulseaudio.muted { + color: #cc3436; +} #temperature.critical { - background-color: @red; + color: #cc3436; } @keyframes blink { @@ -187,22 +164,6 @@ tooltip { } } -#taskbar button.active { - background-color: black; - border-radius: 30px; - padding-left: 0px; - padding-right: 0px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.1s cubic-bezier(.55,-0.68,.48,1.682); -} - -#taskbar button:hover { - padding-left: 0px; - padding-right: 0px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.1s cubic-bezier(.55,-0.68,.48,1.682); -} - #battery.critical:not(.charging) { color: #f53c3c; animation-name: blink; @@ -212,6 +173,19 @@ tooltip { animation-direction: alternate; } +#taskbar button.active { + background-color: #7f849c; + padding-left: 6px; + padding-right: 6px; + animation: gradient_f 20s ease-in infinite; +} + +#taskbar button:hover { + padding-left: 2px; + padding-right: 2px; + animation: gradient_f 20s ease-in infinite; +} + #pulseaudio-slider slider { min-width: 0px; min-height: 0px; @@ -225,13 +199,11 @@ tooltip { min-width: 80px; min-height: 5px; border-radius: 5px; - background-color: #6E6A86; } #pulseaudio-slider highlight { min-height: 10px; border-radius: 5px; - background-color: @selection; } #backlight-slider slider { @@ -247,11 +219,9 @@ tooltip { min-width: 80px; min-height: 10px; border-radius: 5px; - background-color: #6E6A86; } #backlight-slider highlight { min-width: 10px; border-radius: 5px; - background-color: @selection; }