diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a57433..f5ef190 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ ## CHANGES +### 11-Nov-2023 +- Cleanup / renaming of waybar styles and layouts for human readable output +- added Catppuccin Mocha and Latte waybar themes +- Scripts and rofi adjustments in line with waybar cleaning and renaming +- Dark Light function wont change waybar style anymore. However, if Catpuccin waybar themes is in use, color will change according :) +- Drop support for "mauve" waybar style.. I think nobody is using it anyway :) + ### 10-Nov-2023 - Waybar styles menu. (SUPER SHIFT W) Thanks to @Krautt - added different styles of hyprland/workspaces diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf index d92137c..e7c83c0 100644 --- a/config/hypr/configs/Keybinds.conf +++ b/config/hypr/configs/Keybinds.conf @@ -42,7 +42,7 @@ bind = $mainMod ALT, E, exec, $scriptsDir/RofiEmoji.sh bind = $mainMod, W, exec, $scriptsDir/Wallpaper.sh swww bind = $mainMod SHIFT, W, exec, $scriptsDir/WaybarStyles.sh bind = $mainMod CTRL, W, exec, $scriptsDir/WallpaperSelect.sh -bind = $mainMod ALT, W, exec, $scriptsDir/ChangeLayoutMenu.sh +bind = $mainMod ALT, W, exec, $scriptsDir/WaybarLayout.sh bind = $mainMod SHIFT, H, exec, $scriptsDir/Help.sh bind = $mainMod, H, exec, $scriptsDir/KeyHints.sh bind = $mainMod, E, exec, $scriptsDir/QuickEdit.sh diff --git a/config/hypr/scripts/ChangeLayoutMenu.sh b/config/hypr/scripts/ChangeLayoutMenu.sh deleted file mode 100755 index bebe0c0..0000000 --- a/config/hypr/scripts/ChangeLayoutMenu.sh +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/bash - -# Files -#waybar -CONFIG="$HOME/.config/waybar/configs" -WCONFIG="$HOME/.config/waybar/config" - -menu(){ -printf "1. default\n" -printf "2. plasma-style\n" -printf "3. gnome-style\n" -printf "4. simple panel\n" -printf "5. simple 2 panel\n" -printf "6. top & bot panel\n" -printf "7. left panel\n" -printf "8. right panel\n" -printf "9. top & left panel\n" -printf "10. top & right panel\n" -printf "11. bottom & left panel\n" -printf "12. bottom & right panel\n" -printf "13. all sides\n" -printf "14. no panel" -} - -main() { - choice=$(menu | rofi -dmenu -config ~/.config/rofi/config-long.rasi | cut -d. -f1) - case $choice in - 1) - ln -sf "$CONFIG/config-default" "$WCONFIG" - ;; - 2) - ln -sf "$CONFIG/config-plasma" "$WCONFIG" - ;; - 3) - ln -sf "$CONFIG/config-gnome" "$WCONFIG" - ;; - 4) - ln -sf "$CONFIG/config-simple" "$WCONFIG" - ;; - 5) - ln -sf "$CONFIG/config-simple2" "$WCONFIG" - ;; - 6) - ln -sf "$CONFIG/config-dual" "$WCONFIG" - ;; - 7) - ln -sf "$CONFIG/config-left" "$WCONFIG" - ;; - 8) - ln -sf "$CONFIG/config-right" "$WCONFIG" - ;; - 9) - ln -sf "$CONFIG/config-dual-TL" "$WCONFIG" - ;; - 10) - ln -sf "$CONFIG/config-dual-TR" "$WCONFIG" - ;; - 11) - ln -sf "$CONFIG/config-dual-BL" "$WCONFIG" - ;; - 12) - ln -sf "$CONFIG/config-dual-BR" "$WCONFIG" - ;; - 13) - ln -sf "$CONFIG/config-all" "$WCONFIG" - ;; - 14) - if pgrep -x "waybar" >/dev/null; then - pkill waybar - exit - fi - ;; - *) - ;; - esac -} - -# Check if rofi is already running -if pidof rofi >/dev/null; then - pkill rofi - exit 0 -else - main -fi - -exec ~/.config/hypr/scripts/Refresh.sh & - \ No newline at end of file diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh index f20dc33..7cc061f 100755 --- a/config/hypr/scripts/DarkLight.sh +++ b/config/hypr/scripts/DarkLight.sh @@ -41,7 +41,7 @@ fi path_param=$(echo $next_mode | sed 's/.*/\u&/') notify_user "$next_mode" -ln -sf "${waybar_config}/style/style-pywal.css" "${waybar_config}/style.css" +#ln -sf "${waybar_config}/style/style-pywal.css" "${waybar_config}/style.css" ln -sf "${dunst_config}/styles/dunstrc-${next_mode}" "${dunst_config}/styles/dunstrc" # Symlink for rofi theme diff --git a/config/hypr/scripts/WaybarLayout.sh b/config/hypr/scripts/WaybarLayout.sh new file mode 100755 index 0000000..87af0fa --- /dev/null +++ b/config/hypr/scripts/WaybarLayout.sh @@ -0,0 +1,53 @@ +#!/bin/bash + +CONFIG="$HOME/.config/waybar/configs" +WCONFIG="$HOME/.config/waybar/config" + +menu() { + cat </dev/null; then + pkill waybar + exit + fi + ;; + *) + apply_config "$choice" + ;; + esac +} + +# Check if rofi is already running +if pidof rofi >/dev/null; then + pkill rofi + exit 0 +else + main +fi + +exec ~/.config/hypr/scripts/Refresh.sh & diff --git a/config/hypr/scripts/WaybarStyles.sh b/config/hypr/scripts/WaybarStyles.sh index 111d16e..0e71462 100755 --- a/config/hypr/scripts/WaybarStyles.sh +++ b/config/hypr/scripts/WaybarStyles.sh @@ -12,12 +12,13 @@ STYLES=( "colors" "colors-border" "colors-line" -"colorful" -"mauve" +"colorful" +"catppuccin-mocha" +"catppuccin-latte" ) # Build ROFI -SELECTED_STYLE=$(printf "%s\n" "${STYLES[@]}" | rofi -dmenu -p "Choose" -lines "${#STYLES[@]}") +SELECTED_STYLE=$(printf "%s\n" "${STYLES[@]}" | rofi -dmenu -config ~/.config/rofi/config-waybar.rasi "${#STYLES[@]}") # Here you verify the selected theme if [[ " ${STYLES[@]} " =~ " $SELECTED_STYLE " ]]; then diff --git a/config/rofi/config-waybar.rasi b/config/rofi/config-waybar.rasi new file mode 100644 index 0000000..f96751c --- /dev/null +++ b/config/rofi/config-waybar.rasi @@ -0,0 +1,240 @@ +/* ---- ๐Ÿ’ซ https://github.com/JaKooLit ๐Ÿ’ซ ---- */ + +/* ---- Configuration ---- */ +configuration { + modi: "drun,run"; + font: "Fira Code SemiBold 12"; + show-icons: true; + display-drun: "๎ฏ†"; + display-run: "๏„ "; + display-filebrowser: "๏ป"; + display-window: "๏‹"; + drun-display-format: "{name}"; + hover-select: true; + me-select-entry: "MouseSecondary"; + me-accept-entry: "MousePrimary"; + window-format: "{w} ยท {c} ยท {t}"; + +} + +/* ---- Load pywal colors (custom wal template) ---- */ +@import "~/.config/rofi/pywal-color/pywal-theme.rasi" + +/* ---- Window ---- */ +window { + width: 35%; + height: 35%; + x-offset: 0px; + y-offset: 0px; + spacing: 0px; + padding: 0px; + margin: 0px; + color: transparent; + border: 2px; + border-color: @background; + cursor: "default"; + transparency: "real"; + location: center; + anchor: center; + fullscreen: false; + enabled: true; + border-radius: 10px; +} + +/* ---- Mainbox ---- */ +mainbox { + enabled: true; + orientation: horizontal; + spacing: 0px; + margin: 0px; + background-color: transparent; + background-image: url("~/.config/rofi/.current_wallpaper", height); + children: [ "imagebox", "listbox" ]; +} + +/* ---- Imagebox ---- */ +imagebox { + padding: 18px; + background-color: transparent; + orientation: vertical; + children: [ "inputbar", "dummy", "mode-switcher" ]; +} + +/* ---- Listbox ---- */ +listbox { + spacing: 20px; + background-color: transparent; + orientation: vertical; + children: [ "message", "listview" ]; +} +/* ---- Dummy ---- */ +dummy { + background-color: transparent; +} + +/* ---- Inputbar ---- */ +inputbar { + enabled: true; + text-color: @foreground; + spacing: 10px; + padding: 15px; + border-radius: 10px; + border-color: @foreground; + children: [ "textbox-prompt-colon", "entry" ]; +} + +textbox-prompt-colon { + enabled: true; + expand: false; + str: "๐Ÿ”Ž "; + text-color: inherit; +} + +entry { + enabled: true; + background-color: transparent; + text-color: inherit; + cursor: text; + placeholder: "Choose Waybar Styles or Layouts"; + placeholder-color: inherit; +} + +/* ---- Mode Switcher ---- */ +mode-switcher{ + enabled: true; + spacing: 20px; + background-color: transparent; + text-color: @foreground; +} + +button { + padding: 10px; + border-radius: 10px; + background-color: @background; + text-color: inherit; + cursor: pointer; + border: 0px; +} + +button selected { + background-color: @selected-normal-background; + text-color: @foreground; +} + +/* ---- Listview ---- */ +listview { + enabled: true; + columns: 1; + lines: 10; + cycle: true; + dynamic: true; + scrollbar: true; + layout: vertical; + reverse: false; + fixed-height: true; + fixed-columns: true; + spacing: 0px; + padding: 10px; + margin: 0px; + border-radius: 10px; + border: 0px; + background-image: url("~/.config/rofi/.current_wallpaper", height); +} + +/* ---- Element ---- */ +element { + enabled: true; + padding: 5px; + margin: 2px; + cursor: pointer; + background-color: @background; + border-radius: 10px; + border: 0px; +} + +element normal.normal { + background-color: inherit; + text-color: @foreground; +} + +element normal.urgent { + background-color: inherit; + text-color: @foreground; +} + +element normal.active { + background-color: inherit; + text-color: @foreground; +} + +element selected.normal { + background-color: @selected-normal-background; + text-color: @foreground; +} + +element selected.urgent { + background-color: inherit; + text-color: @foreground; +} + +element selected.active { + background-color: inherit; + text-color: @foreground; +} + +element alternate.normal { + background-color: inherit; + text-color: @foreground; +} + +element alternate.urgent { + background-color: inherit; + text-color: @foreground; +} + +element alternate.active { + background-color: inherit; + text-color: @foreground; +} + +element-icon { + background-color: transparent; + text-color: inherit; + size: 32px; + cursor: inherit; +} + +element-text { + background-color: transparent; + text-color: inherit; + cursor: inherit; + vertical-align: 0.5; + horizontal-align: 0.0; +} + +/*****----- Message -----*****/ +message { + background-color: transparent; + border: 0px; + margin: 20px 0px 0px 0px; + padding: 0px; + spacing: 0px; + border-radius: 10px; +} + +textbox { + padding: 15px; + margin: 0px; + border-radius: 0px; + background-color: @background; + text-color: @foreground; + vertical-align: 0.5; + horizontal-align: 0.0; +} + +error-message { + padding: 15px; + border-radius: 20px; + background-color: @background; + text-color: @foreground; +} diff --git a/config/waybar/configs/config-plasma b/config/waybar/configs/config-Bottom(plasma) similarity index 100% rename from config/waybar/configs/config-plasma rename to config/waybar/configs/config-Bottom(plasma) diff --git a/config/waybar/configs/config-dual-BL b/config/waybar/configs/config-Bottom-Left similarity index 100% rename from config/waybar/configs/config-dual-BL rename to config/waybar/configs/config-Bottom-Left diff --git a/config/waybar/configs/config-dual-BR b/config/waybar/configs/config-Bottom-Right similarity index 100% rename from config/waybar/configs/config-dual-BR rename to config/waybar/configs/config-Bottom-Right diff --git a/config/waybar/configs/config-left b/config/waybar/configs/config-Left similarity index 100% rename from config/waybar/configs/config-left rename to config/waybar/configs/config-Left diff --git a/config/waybar/configs/config-right b/config/waybar/configs/config-Right similarity index 100% rename from config/waybar/configs/config-right rename to config/waybar/configs/config-Right diff --git a/config/waybar/configs/config-gnome b/config/waybar/configs/config-Top(gnome) similarity index 100% rename from config/waybar/configs/config-gnome rename to config/waybar/configs/config-Top(gnome) diff --git a/config/waybar/configs/config-dual b/config/waybar/configs/config-Top-&-Bottom similarity index 100% rename from config/waybar/configs/config-dual rename to config/waybar/configs/config-Top-&-Bottom diff --git a/config/waybar/configs/config-dual-TL b/config/waybar/configs/config-Top-Left similarity index 100% rename from config/waybar/configs/config-dual-TL rename to config/waybar/configs/config-Top-Left diff --git a/config/waybar/configs/config-dual-TR b/config/waybar/configs/config-Top-Right similarity index 100% rename from config/waybar/configs/config-dual-TR rename to config/waybar/configs/config-Top-Right diff --git a/config/waybar/configs/config-all b/config/waybar/configs/config-all-sides similarity index 100% rename from config/waybar/configs/config-all rename to config/waybar/configs/config-all-sides diff --git a/config/waybar/configs/config-simple b/config/waybar/configs/config-simple-long similarity index 100% rename from config/waybar/configs/config-simple rename to config/waybar/configs/config-simple-long diff --git a/config/waybar/configs/config-simple2 b/config/waybar/configs/config-simple-short similarity index 100% rename from config/waybar/configs/config-simple2 rename to config/waybar/configs/config-simple-short diff --git a/config/waybar/modules b/config/waybar/modules index 255a5e8..fc0e7db 100644 --- a/config/waybar/modules +++ b/config/waybar/modules @@ -398,7 +398,7 @@ "tooltip": false, "on-click": "pkill rofi || rofi -show drun -modi run,drun,filebrowser", "on-click-middle": "~/.config/hypr/scripts/WallpaperSelect.sh", - "on-click-right": "~/.config/hypr/scripts/ChangeLayoutMenu.sh", + "on-click-right": "~/.config/hypr/scripts/WaybarLayout.sh", }, "custom/playerctl": { diff --git a/config/waybar/style/catppuccin-themes/latte.css b/config/waybar/style/catppuccin-themes/latte.css new file mode 100644 index 0000000..085cc3e --- /dev/null +++ b/config/waybar/style/catppuccin-themes/latte.css @@ -0,0 +1,37 @@ +/* +* +* Catppuccin Latte palette +* Maintainer: rubyowo +* +*/ + +@define-color base #eff1f5; +@define-color mantle #e6e9ef; +@define-color crust #dce0e8; + +@define-color text #4c4f69; +@define-color subtext0 #6c6f85; +@define-color subtext1 #5c5f77; + +@define-color surface0 #ccd0da; +@define-color surface1 #bcc0cc; +@define-color surface2 #acb0be; + +@define-color overlay0 #9ca0b0; +@define-color overlay1 #8c8fa1; +@define-color overlay2 #7c7f93; + +@define-color blue #1e66f5; +@define-color lavender #7287fd; +@define-color sapphire #209fb5; +@define-color sky #04a5e5; +@define-color teal #179299; +@define-color green #40a02b; +@define-color yellow #df8e1d; +@define-color peach #fe640b; +@define-color maroon #e64553; +@define-color red #d20f39; +@define-color mauve #8839ef; +@define-color pink #ea76cb; +@define-color flamingo #dd7878; +@define-color rosewater #dc8a78; diff --git a/config/waybar/style/catppuccin-themes/mocha.css b/config/waybar/style/catppuccin-themes/mocha.css new file mode 100644 index 0000000..7f4e337 --- /dev/null +++ b/config/waybar/style/catppuccin-themes/mocha.css @@ -0,0 +1,38 @@ +/* +* +* Catppuccin Mocha palette +* Maintainer: rubyowo +* +*/ + +@define-color base #1e1e2e; +@define-color mantle #181825; +@define-color crust #11111b; + +@define-color text #cdd6f4; +@define-color subtext0 #a6adc8; +@define-color subtext1 #bac2de; + +@define-color surface0 #313244; +@define-color surface1 #45475a; +@define-color surface2 #585b70; + +@define-color overlay0 #6c7086; +@define-color overlay1 #7f849c; +@define-color overlay2 #9399b2; + +@define-color blue #89b4fa; +@define-color lavender #b4befe; +@define-color sapphire #74c7ec; +@define-color sky #89dceb; +@define-color teal #94e2d5; +@define-color green #a6e3a1; +@define-color yellow #f9e2af; +@define-color peach #fab387; +@define-color maroon #eba0ac; +@define-color red #f38ba8; +@define-color mauve #cba6f7; +@define-color pink #f5c2e7; +@define-color flamingo #f2cdcd; +@define-color rosewater #f5e0dc; + diff --git a/config/waybar/style/style-Black-&-White.css b/config/waybar/style/style-Black-&-White.css index 41d930f..30e536c 100644 --- a/config/waybar/style/style-Black-&-White.css +++ b/config/waybar/style/style-Black-&-White.css @@ -1,4 +1,6 @@ -*{ +/* ---- ๐Ÿ’ซ https://github.com/JaKooLit ๐Ÿ’ซ ---- */ + +* { font-family: "JetBrainsMono Nerd Font"; font-weight: bold; min-height: 0; diff --git a/config/waybar/style/style-catppuccin-latte.css b/config/waybar/style/style-catppuccin-latte.css new file mode 100644 index 0000000..9dc77d5 --- /dev/null +++ b/config/waybar/style/style-catppuccin-latte.css @@ -0,0 +1,225 @@ +/* ---- ๐Ÿ’ซ https://github.com/JaKooLit ๐Ÿ’ซ ---- */ + +* { +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: 98%; +font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; +padding: 1px; +margin-top: 1px; +margin-bottom: 1px; +} + +@import "../waybar/style/catppuccin-themes/latte.css"; + +window#waybar { + transition-property: background-color; + transition-duration: 0.5s; + background: @theme_base_color; + border: 2px solid @overlay0; + border-radius: 10px; +} + +window#waybar.hidden { + opacity: 0.2; +} + +#waybar.empty #window { + 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; */ +/* } */ + +/* .modules-center { */ + /* border: 3px solid @lavender; */ + /* margin: 0px 5px; */ +/* } */ + +#backlight, +#battery, +#bluetooth, +#cava, +#clock, +#cpu, +#disk, +#idle_inhibitor, +#keyboard-state label, +#keyboard-state label.locked, +#keyboard-state, +#memory, +#mode, +#mpd, +#network, +#pulseaudio, +#taskbar button, +#taskbar, +#temperature, +#tray, +#window, +#wireplumber, +#workspaces, +#custom-cycle_wall, +#custom-keybinds, +#custom-light_dark, +#custom-lock, +#custom-menu, +#custom-power_vertical, +#custom-power, +#custom-spotify, +#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 { + padding: 0px 6px; +} + +#idle_inhibitor { + color: @blue; +} + +#backlight { + color: @blue; +} + +#battery { + color: @green; +} + +@keyframes blink { + to { + color: @surface0; + } +} + +#battery.critical:not(.charging) { + background-color: @red; + color: @theme_text_color; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; + box-shadow: inset 0 -3px transparent; +} + +#clock { + color: @yellow; +} + +#cpu { + color: @green; +} + +#memory { + color: @sky; +} + +#disk { + color: @sapphire; +} + +#tray > .passive { + -gtk-icon-effect: dim; +} +#tray > .needs-attention { + -gtk-icon-effect: highlight; +} + +#workspaces button { + border-radius: 5px; + /*margin: 3px;*/ + /*padding: 1px;*/ +} + +#workspaces button:hover { + border-radius: 5px; + color: @overlay0; + background-color: @surface0; +} + +#workspaces button.persistent { + color: @surface1; + border-radius: 0px; +} + +#workspaces button.active { + color: @peach; + border-radius: 0px; +} + +#workspaces button.urgent { + color: @red; + border-radius: 0px; +} + +#custom-menu { + color: @rosewater; +} + +#custom-power { + color: @red; + margin-right: 3px; +} + +#custom-updater { + color: @red; +} + +#custom-uptime { + color: @blue; +} + +#custom-weather { + color: @lavender; +} + +#custom-vpn_check { + color: @sky; +} +#custom-cputemp { + color: @teal; +} + +#pulseaudio { + color: @sapphire; +} + +#pulseaudio.bluetooth { + color: @pink; +} +#pulseaudio.muted { + color: @red; +} + +#window { + color: @mauve; +} + +#custom-waybar-mpris { + color:@lavender; +} + +#network { + color: @teal; +} +#network.disconnected, +#network.disabled { + background-color: @surface0; + color: @text; +} diff --git a/config/waybar/style/style-catppuccin-mocha.css b/config/waybar/style/style-catppuccin-mocha.css new file mode 100644 index 0000000..8fe2160 --- /dev/null +++ b/config/waybar/style/style-catppuccin-mocha.css @@ -0,0 +1,225 @@ +/* ---- ๐Ÿ’ซ https://github.com/JaKooLit ๐Ÿ’ซ ---- */ + +* { +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: 98%; +font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; +padding: 1px; +margin-top: 1px; +margin-bottom: 1px; +} + +@import "../waybar/style/catppuccin-themes/mocha.css"; + +window#waybar { + transition-property: background-color; + transition-duration: 0.5s; + background: @theme_base_color; + border: 2px solid @overlay0; + border-radius: 10px; +} + +window#waybar.hidden { + opacity: 0.2; +} + +#waybar.empty #window { + 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; */ +/* } */ + +/* .modules-center { */ + /* border: 3px solid @lavender; */ + /* margin: 0px 5px; */ +/* } */ + +#backlight, +#battery, +#bluetooth, +#cava, +#clock, +#cpu, +#disk, +#idle_inhibitor, +#keyboard-state label, +#keyboard-state label.locked, +#keyboard-state, +#memory, +#mode, +#mpd, +#network, +#pulseaudio, +#taskbar button, +#taskbar, +#temperature, +#tray, +#window, +#wireplumber, +#workspaces, +#custom-cycle_wall, +#custom-keybinds, +#custom-light_dark, +#custom-lock, +#custom-menu, +#custom-power_vertical, +#custom-power, +#custom-spotify, +#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 { + padding: 0px 6px; +} + +#idle_inhibitor { + color: @blue; +} + +#backlight { + color: @blue; +} + +#battery { + color: @green; +} + +@keyframes blink { + to { + color: @surface0; + } +} + +#battery.critical:not(.charging) { + background-color: @red; + color: @theme_text_color; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; + box-shadow: inset 0 -3px transparent; +} + +#clock { + color: @yellow; +} + +#cpu { + color: @green; +} + +#memory { + color: @sky; +} + +#disk { + color: @sapphire; +} + +#tray > .passive { + -gtk-icon-effect: dim; +} +#tray > .needs-attention { + -gtk-icon-effect: highlight; +} + +#workspaces button { + border-radius: 5px; + /*margin: 3px;*/ + /*padding: 1px;*/ +} + +#workspaces button:hover { + border-radius: 5px; + color: @overlay0; + background-color: @surface0; +} + +#workspaces button.persistent { + color: @surface1; + border-radius: 0px; +} + +#workspaces button.active { + color: @peach; + border-radius: 0px; +} + +#workspaces button.urgent { + color: @red; + border-radius: 0px; +} + +#custom-menu { + color: @rosewater; +} + +#custom-power { + color: @red; + margin-right: 3px; +} + +#custom-updater { + color: @red; +} + +#custom-uptime { + color: @blue; +} + +#custom-weather { + color: @lavender; +} + +#custom-vpn_check { + color: @sky; +} +#custom-cputemp { + color: @teal; +} + +#pulseaudio { + color: @sapphire; +} + +#pulseaudio.bluetooth { + color: @pink; +} +#pulseaudio.muted { + color: @red; +} + +#window { + color: @mauve; +} + +#custom-waybar-mpris { + color:@lavender; +} + +#network { + color: @teal; +} +#network.disconnected, +#network.disabled { + background-color: @surface0; + color: @text; +} diff --git a/config/waybar/style/style-colorful.css b/config/waybar/style/style-colorful.css index 9f9718a..80b3f60 100644 --- a/config/waybar/style/style-colorful.css +++ b/config/waybar/style/style-colorful.css @@ -1,11 +1,13 @@ -*{ +/* ---- ๐Ÿ’ซ https://github.com/JaKooLit ๐Ÿ’ซ ---- */ + +* { 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: 98%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; -padding: 0px; +padding: 1px; margin-top: 1px; margin-bottom: 1px; } diff --git a/config/waybar/style/style-colors-border.css b/config/waybar/style/style-colors-border.css index 5e5bbb0..4aaef8e 100644 --- a/config/waybar/style/style-colors-border.css +++ b/config/waybar/style/style-colors-border.css @@ -1,16 +1,17 @@ -*{ +/* ---- ๐Ÿ’ซ https://github.com/JaKooLit ๐Ÿ’ซ ---- */ + +* { 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: 98%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; -padding: 0px; +padding: 1px; margin-top: 1px; margin-bottom: 1px; } - window#waybar { /* background-color: rgba(26, 27, 38, 0.5); */ background-color: transparent; diff --git a/config/waybar/style/style-colors-line.css b/config/waybar/style/style-colors-line.css index 4869d80..c5e11e8 100644 --- a/config/waybar/style/style-colors-line.css +++ b/config/waybar/style/style-colors-line.css @@ -1,3 +1,5 @@ +/* ---- ๐Ÿ’ซ https://github.com/JaKooLit ๐Ÿ’ซ ---- */ + * { font-family: "JetBrainsMono Nerd Font"; font-weight: bold; diff --git a/config/waybar/style/style-colors.css b/config/waybar/style/style-colors.css index d273370..2bae4fb 100644 --- a/config/waybar/style/style-colors.css +++ b/config/waybar/style/style-colors.css @@ -12,20 +12,20 @@ @define-color accent5 #7da6ff; @define-color accent6 #0db9d7; -*{ +/* ---- ๐Ÿ’ซ https://github.com/JaKooLit ๐Ÿ’ซ ---- */ + +* { 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: 98%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; -padding: 0px; +padding: 1px; margin-top: 1px; margin-bottom: 1px; } -/* icons start at U+E900 in Jetbrains mono in gucharmap */ - window#waybar { background-color: rgba(50, 50, 50, 0.0); /*background-color: @bgcolor;*/ diff --git a/config/waybar/style/style-dark.css b/config/waybar/style/style-dark.css index 9ca82fb..289c080 100644 --- a/config/waybar/style/style-dark.css +++ b/config/waybar/style/style-dark.css @@ -1,4 +1,6 @@ -*{ +/* ---- ๐Ÿ’ซ https://github.com/JaKooLit ๐Ÿ’ซ ---- */ + +* { font-family: "JetBrainsMono Nerd Font"; font-weight: bold; min-height: 0; diff --git a/config/waybar/style/style-light.css b/config/waybar/style/style-light.css index 0fa9581..6f73d91 100644 --- a/config/waybar/style/style-light.css +++ b/config/waybar/style/style-light.css @@ -1,4 +1,6 @@ -*{ +/* ---- ๐Ÿ’ซ https://github.com/JaKooLit ๐Ÿ’ซ ---- */ + +* { font-family: "JetBrainsMono Nerd Font"; font-weight: bold; min-height: 0; diff --git a/config/waybar/style/style-mauve.css b/config/waybar/style/style-mauve.css deleted file mode 100644 index 2e7bb8d..0000000 --- a/config/waybar/style/style-mauve.css +++ /dev/null @@ -1,161 +0,0 @@ -*{ -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: 98%; -font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; -padding: 0px; -margin-top: 1px; -margin-bottom: 1px; -} - -window#waybar { - background: transparent; - border-radius: 10px; - color: #cba6f7; - border-style: solid; - border-width: 1px; - border-color: #cba6f7; -} - -window#waybar.hidden { - opacity: 0.5; -} -window#waybar.empty { - background-color: transparent; -} - -window#waybar.empty #window { - padding: 0px; - margin: 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 { - /*background-color: #1e1e2e;*/ - border: 0px solid #b4befe; - border-radius: 10px; -} - -.modules-center { - /*background-color: #1e1e2e;*/ - border: 0px solid #b4befe; - border-radius: 10px; -} - -.modules-left { - /*background-color: #1e1e2e;*/ - border: 0px solid #b4befe; - border-radius: 10px; - -} - -#workspaces button { - padding: 2px; - color: #6E6A86; - margin-right: 5px; -} - -#workspaces button.active { - color: #cba6f7; - border-radius: 15px 15px 15px 15px; -} - -#workspaces button.focused { - color: #d8dee9; -} - -#workspaces button.urgent { - color: #11111b; - border-radius: 10px; -} - -#workspaces button:hover { - color: #9CCFD8; - border-radius: 15px; -} - -#backlight, -#battery, -#bluetooth, -#cava, -#clock, -#cpu, -#disk, -#idle_inhibitor, -#keyboard-state label, -#keyboard-state label.locked, -#keyboard-state, -#memory, -#mode, -#mpd, -#network, -#pulseaudio, -#taskbar button, -#taskbar, -#temperature, -#tray, -#window, -#wireplumber, -#workspaces, -#custom-cycle_wall, -#custom-keybinds, -#custom-light_dark, -#custom-lock, -#custom-menu, -#custom-power_vertical, -#custom-power, -#custom-spotify, -#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: #cba7f7; - padding: 3px 6px; - border-radius:10px; -} - -#temperature.critical { - background-color: #ff0000; -} - -@keyframes blink { - to { - color: #000000; - } -} - -#taskbar button.active { - background-color: #7f849c; -} - -#battery.critical:not(.charging) { - color: #f53c3c; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; -} - \ No newline at end of file diff --git a/config/waybar/style/style-pywal.css b/config/waybar/style/style-pywal.css index 57c875c..bd933d0 100644 --- a/config/waybar/style/style-pywal.css +++ b/config/waybar/style/style-pywal.css @@ -1,4 +1,6 @@ -*{ +/* ---- ๐Ÿ’ซ https://github.com/JaKooLit ๐Ÿ’ซ ---- */ + +* { font-family: "JetBrainsMono Nerd Font"; font-weight: bold; min-height: 0;