diff options
| author | Ja.KooLit <85185940+JaKooLit@users.noreply.github.com> | 2024-06-11 04:15:57 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-11 04:15:57 +0900 |
| commit | 22b85572e891b874011893f62d4eaf94f20486df (patch) | |
| tree | 3452d4164a8964cd85fe57de2bd128baeb0ee2ff | |
| parent | c4ee8142bf7e8d89602cb7712da10888a54d438b (diff) | |
| parent | ed21639feebd8e3b6a6a4c2a59686f777b9688b9 (diff) | |
Merge pull request #338 from JaKooLit/development
Development to Main including pre-release
50 files changed, 623 insertions, 721 deletions
diff --git a/config/cava/config b/config/cava/config index 9b303859..853a7055 100644 --- a/config/cava/config +++ b/config/cava/config @@ -143,14 +143,14 @@ source = auto gradient = 1
gradient_count = 8
-gradient_color_1 = '#060402'
-gradient_color_2 = '#677762'
-gradient_color_3 = '#2586B5'
-gradient_color_4 = '#94A7B8'
-gradient_color_5 = '#B5EDF4'
-gradient_color_6 = '#CCBA98'
-gradient_color_7 = '#C6DEF5'
-gradient_color_8 = '#B5EDF4'
+gradient_color_1 = '#030508'
+gradient_color_2 = '#2A3859'
+gradient_color_3 = '#324166'
+gradient_color_4 = '#11606B'
+gradient_color_5 = '#BCADBB'
+gradient_color_6 = '#2B7F48'
+gradient_color_7 = '#16808F'
+gradient_color_8 = '#BCADBB'
[color]
diff --git a/config/hypr/UserConfigs/Laptops.conf b/config/hypr/UserConfigs/Laptops.conf index 2f1f2077..1a1226a9 100644 --- a/config/hypr/UserConfigs/Laptops.conf +++ b/config/hypr/UserConfigs/Laptops.conf @@ -7,6 +7,9 @@ $mainMod = SUPER $scriptsDir = $HOME/.config/hypr/scripts $UserConfigs = $HOME/.config/hypr/UserConfigs +# for disabling Touchpad. hyprctl devices to get device name. +$Touchpad_Device=asue1209:00-04f3:319f-touchpad + binde = , xf86KbdBrightnessDown, exec, $scriptsDir/BrightnessKbd.sh --dec #Keyboard brightness Down binde = , xf86KbdBrightnessUp, exec, $scriptsDir/BrightnessKbd.sh --inc #Keyboard brightness up bind = , xf86Launch1, exec, rog-control-center # ASUS Armory crate button @@ -23,6 +26,11 @@ bind = $mainMod CTRL, F6, exec, $scriptsDir/ScreenShot.sh --in5 # Screenshot in bind = $mainMod ALT, F6, exec, $scriptsDir/ScreenShot.sh --in10 # Screenshot in 10 secs bind = ALT, F6, exec, $scriptsDir/ScreenShot.sh --active # Screenshot active window +$TOUCHPAD_ENABLED = true +device { + name = $Touchpad_Device + enabled = $TOUCHPAD_ENABLED +} # Below are useful when you are connecting your laptop in external display # Suggest you edit below for your laptop display # From WIKI This is to disable laptop monitor when lid is closed. diff --git a/config/hypr/UserScripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh index af5c65d2..da6a8931 100755 --- a/config/hypr/UserScripts/QuickEdit.sh +++ b/config/hypr/UserScripts/QuickEdit.sh @@ -1,6 +1,10 @@ #!/bin/bash # Rofi menu for Quick Edit / View of Settings (SUPER E) +# define your preferred text editor and terminal to use +editor=nano +tty=kitty + configs="$HOME/.config/hypr/configs" UserConfigs="$HOME/.config/hypr/UserConfigs" @@ -21,34 +25,34 @@ main() { choice=$(menu | rofi -i -dmenu -config ~/.config/rofi/config-compact.rasi | cut -d. -f1) case $choice in 1) - kitty -e nano "$UserConfigs/ENVariables.conf" + $tty $editor "$UserConfigs/ENVariables.conf" ;; 2) - kitty -e nano "$UserConfigs/WindowRules.conf" + $tty $editor "$UserConfigs/WindowRules.conf" ;; 3) - kitty -e nano "$UserConfigs/Startup_Apps.conf" + $tty $editor "$UserConfigs/Startup_Apps.conf" ;; 4) - kitty -e nano "$UserConfigs/UserKeybinds.conf" + $tty $editor "$UserConfigs/UserKeybinds.conf" ;; 5) - kitty -e nano "$UserConfigs/Monitors.conf" + $tty $editor "$UserConfigs/Monitors.conf" ;; 6) - kitty -e nano "$UserConfigs/Laptops.conf" + $tty $editor "$UserConfigs/Laptops.conf" ;; 7) - kitty -e nano "$UserConfigs/UserSettings.conf" + $tty $editor "$UserConfigs/UserSettings.conf" ;; 8) - kitty -e nano "$UserConfigs/WorkspaceRules.conf" + $tty $editor "$UserConfigs/WorkspaceRules.conf" ;; 9) - kitty -e nano "$configs/Settings.conf" + $tty $editor "$configs/Settings.conf" ;; 10) - kitty -e nano "$configs/Keybinds.conf" + $tty $editor "$configs/Keybinds.conf" ;; *) ;; diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh index ffd0e7ae..7a7ac3f5 100755 --- a/config/hypr/UserScripts/RofiBeats.sh +++ b/config/hypr/UserScripts/RofiBeats.sh @@ -59,12 +59,12 @@ play_local_music() { # For some reason wont start playlist at 0 if [[ $i -eq 0 ]]; then # Play the selected local music file using mpv - mpv --loop-playlist --vid=no "$mDIR" + mpv --loop-playlist --vid=no "$mDIR/$choice" else file=$i # Play the selected local music file using mpv - mpv --playlist-start="$file" --loop-playlist --vid=no "$mDIR" + mpv --playlist-start="$file" --loop-playlist --vid=no "$mDIR/$choice" fi break fi diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf index dbec4d10..30486de2 100644 --- a/config/hypr/configs/Keybinds.conf +++ b/config/hypr/configs/Keybinds.conf @@ -12,8 +12,8 @@ $UserScripts = $HOME/.config/hypr/UserScripts bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0 bind = $mainMod, Q, killactive, -bind = $mainMod, F, fullscreen -bind = $mainMod SHIFT, Q, closewindow, +bind = $mainMod, F, fullscreen +bind = $mainMod SHIFT, Q, exec, $scriptsDir/KillActiveProcess.sh bind = $mainMod SHIFT, F, togglefloating, bind = $mainMod ALT, F, exec, hyprctl dispatch workspaceopt allfloat bind = CTRL ALT, L, exec, $scriptsDir/LockScreen.sh diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh index e6f212f6..77426902 100755 --- a/config/hypr/scripts/DarkLight.sh +++ b/config/hypr/scripts/DarkLight.sh @@ -14,6 +14,8 @@ SCRIPTSDIR="$HOME/.config/hypr/scripts" notif="$HOME/.config/swaync/images/bell.png" wallust_rofi="$HOME/.config/wallust/templates/colors-rofi.rasi" +kitty_conf="$HOME/.config/kitty/kitty.conf" + wallust_config="$HOME/.config/wallust/wallust.toml" pallete_dark="dark16" pallete_light="light16" @@ -97,6 +99,20 @@ else sed -i '/@define-color noti-bg-alt/s/#.*;/#F0F0F0;/' "${ags_style}" fi +# kitty background color change +if [ "$next_mode" = "Dark" ]; then + sed -i '/^foreground /s/^foreground .*/foreground #dddddd/' "${kitty_conf}" + sed -i '/^background /s/^background .*/background #000000/' "${kitty_conf}" + sed -i '/^cursor /s/^cursor .*/cursor #dddddd/' "${kitty_conf}" +else + sed -i '/^foreground /s/^foreground .*/foreground #000000/' "${kitty_conf}" + sed -i '/^background /s/^background .*/background #dddddd/' "${kitty_conf}" + sed -i '/^cursor /s/^cursor .*/cursor #000000/' "${kitty_conf}" +fi + + + + # Set Dynamic Wallpaper for Dark or Light Mode if [ "$next_mode" = "Dark" ]; then next_wallpaper="$(find "${dark_wallpapers}" -type f \( -iname "*.jpg" -o -iname "*.png" \) -print0 | shuf -n1 -z | xargs -0)" diff --git a/config/hypr/scripts/KeyHints.sh b/config/hypr/scripts/KeyHints.sh index 612038d2..85fb1dc6 100755 --- a/config/hypr/scripts/KeyHints.sh +++ b/config/hypr/scripts/KeyHints.sh @@ -45,7 +45,7 @@ yad --width=$dynamic_width --height=$dynamic_height \ " T" "Open File Manager" "(Thunar)" \ " S" "Google Search" "(rofi)" \ " Q" "close active window" "(not kill)" \ -" Shift Q " "closes a specified window" "(window)" \ +" Shift Q " "kills an active window" "(kill)" \ " Z" "Desktop Zoom" "(pyprland)" \ " Alt V" "Clipboard Manager" "(cliphist)" \ " W" "Choose wallpaper" "(Wallpaper Menu)" \ diff --git a/config/hypr/scripts/KillActiveProcess.sh b/config/hypr/scripts/KillActiveProcess.sh new file mode 100755 index 00000000..bee146d7 --- /dev/null +++ b/config/hypr/scripts/KillActiveProcess.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## + +# Copied from Discord post. Thanks to @Zorg + + +# Get id of an active window +active_pid=$(hyprctl activewindow | grep -o 'pid: [0-9]*' | cut -d' ' -f2) + +# Close active window +kill $active_pid
\ No newline at end of file diff --git a/config/hypr/scripts/TouchPad.sh b/config/hypr/scripts/TouchPad.sh index e94ee068..228e4ca2 100755 --- a/config/hypr/scripts/TouchPad.sh +++ b/config/hypr/scripts/TouchPad.sh @@ -1,27 +1,32 @@ #!/bin/bash # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## # For disabling touchpad. -# Edit the Touchpad_Device according to your system +# Edit the Touchpad_Device on ~/.config/hypr/UserConfigs/Laptops.conf according to your system # use hyprctl devices to get your system touchpad device name +# source https://github.com/hyprwm/Hyprland/discussions/4283?sort=new#discussioncomment-8648109 - -Touchpad_Device="asue1209:00-04f3:319f-touchpad" notif="$HOME/.config/swaync/images/bell.png" -XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR:-/run/user/$(id -u)} -STATUS_FILE="$XDG_RUNTIME_DIR/touchpad.status" +export STATUS_FILE="$XDG_RUNTIME_DIR/touchpad.status" -toggle_touchpad() { - if [ ! -f "$STATUS_FILE" ] || [ "$(cat "$STATUS_FILE")" = "false" ]; then - echo "true" > "$STATUS_FILE" - action="enabled" - else - echo "false" > "$STATUS_FILE" - action="disabled" - fi +enable_touchpad() { + printf "true" >"$STATUS_FILE" + notify-send -u low -i $notif "Enabling touchpad" + hyprctl keyword '$TOUCHPAD_ENABLED' "true" -r +} - notify-send -u low -i "$notif" "Touchpad $action" - hyprctl keyword "device[$Touchpad_Device]:enabled" "$(cat "$STATUS_FILE")" +disable_touchpad() { + printf "false" >"$STATUS_FILE" + notify-send -u low -i $notif "Disabling touchpad" + hyprctl keyword '$TOUCHPAD_ENABLED' "false" -r } -toggle_touchpad +if ! [ -f "$STATUS_FILE" ]; then + enable_touchpad +else + if [ $(cat "$STATUS_FILE") = "true" ]; then + disable_touchpad + elif [ $(cat "$STATUS_FILE") = "false" ]; then + enable_touchpad + fi +fi diff --git a/config/hypr/v2.2.13 b/config/hypr/v2.2.14 index 31b3414d..31b3414d 100644 --- a/config/hypr/v2.2.13 +++ b/config/hypr/v2.2.14 diff --git a/config/hypr/wallpaper_effects/.wallpaper_current b/config/hypr/wallpaper_effects/.wallpaper_current Binary files differindex c8681762..d46136eb 100644 --- a/config/hypr/wallpaper_effects/.wallpaper_current +++ b/config/hypr/wallpaper_effects/.wallpaper_current diff --git a/config/hypr/wallpaper_effects/.wallpaper_modified b/config/hypr/wallpaper_effects/.wallpaper_modified Binary files differindex a6a14cf1..771d86f9 100644 --- a/config/hypr/wallpaper_effects/.wallpaper_modified +++ b/config/hypr/wallpaper_effects/.wallpaper_modified diff --git a/config/hypr/wallust/wallust-hyprland.conf b/config/hypr/wallust/wallust-hyprland.conf index 86f1869c..3ec65c1a 100644 --- a/config/hypr/wallust/wallust-hyprland.conf +++ b/config/hypr/wallust/wallust-hyprland.conf @@ -1,18 +1,18 @@ -$background = rgb(020302) -$foreground = rgb(BFBEB7) -$color0 = rgb(020302) -$color1 = rgb(171812) -$color2 = rgb(1F1E16) -$color3 = rgb(26251B) -$color4 = rgb(2E2C20) -$color5 = rgb(363324) -$color6 = rgb(363324) -$color7 = rgb(9B998F) -$color8 = rgb(6C6B64) -$color9 = rgb(1F1F18) -$color10 = rgb(29291E) -$color11 = rgb(333224) -$color12 = rgb(3E3B2A) -$color13 = rgb(484430) -$color14 = rgb(484430) -$color15 = rgb(9B998F) +$background = rgb(030508) +$foreground = rgb(D6CBD5) +$color0 = rgb(030508) +$color1 = rgb(0C1523) +$color2 = rgb(2A3859) +$color3 = rgb(324166) +$color4 = rgb(205F36) +$color5 = rgb(11606B) +$color6 = rgb(685066) +$color7 = rgb(BCADBB) +$color8 = rgb(847983) +$color9 = rgb(101C2F) +$color10 = rgb(384B76) +$color11 = rgb(425788) +$color12 = rgb(2B7F48) +$color13 = rgb(16808F) +$color14 = rgb(8A6B88) +$color15 = rgb(BCADBB) diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index 1437ce07..f8255096 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -4,7 +4,7 @@ bold_font auto italic_font auto bold_italic_font auto -background_opacity 0.7 +background_opacity 0.5 confirm_os_window_close 0 scrollback_lines 2000 @@ -12,7 +12,11 @@ wheel_scroll_min_lines 1 enable_audio_bell no -selection_foreground #000000 -selection_background #F5FBFF +selection_foreground none +selection_background none -window_padding_width 4
\ No newline at end of file +window_padding_width 4 + +foreground #dddddd +background #000000 +cursor #dddddd
\ No newline at end of file diff --git a/config/rofi/wallust/colors-rofi.rasi b/config/rofi/wallust/colors-rofi.rasi index b7cc56a7..bdbf8eb6 100644 --- a/config/rofi/wallust/colors-rofi.rasi +++ b/config/rofi/wallust/colors-rofi.rasi @@ -1,28 +1,28 @@ * { -active-background: #1F1F18; -active-foreground: #BFBEB7; -normal-background: #020302; -normal-foreground: #BFBEB7; -urgent-background: #3E3B2A; -urgent-foreground: #BFBEB7; +active-background: #101C2F; +active-foreground: #D6CBD5; +normal-background: #030508; +normal-foreground: #D6CBD5; +urgent-background: #2B7F48; +urgent-foreground: #D6CBD5; -alternate-active-background: #363324; -alternate-active-foreground: #BFBEB7; -alternate-normal-background: #020302; -alternate-normal-foreground: #BFBEB7; -alternate-urgent-background: #020302; -alternate-urgent-foreground: #BFBEB7; +alternate-active-background: #11606B; +alternate-active-foreground: #D6CBD5; +alternate-normal-background: #030508; +alternate-normal-foreground: #D6CBD5; +alternate-urgent-background: #030508; +alternate-urgent-foreground: #D6CBD5; -selected-active-background: #1F1F18; -selected-active-foreground: #BFBEB7; -selected-normal-background: #9B998F; -selected-normal-foreground: #BFBEB7; -selected-urgent-background: #3E3B2A; -selected-urgent-foreground: #BFBEB7; +selected-active-background: #101C2F; +selected-active-foreground: #D6CBD5; +selected-normal-background: #BCADBB; +selected-normal-foreground: #D6CBD5; +selected-urgent-background: #2B7F48; +selected-urgent-foreground: #D6CBD5; -background-color: #020302; +background-color: #030508; background: rgba(0,0,0,0.7); -foreground: #9B998F; -border-color: #1F1F18; +foreground: #BCADBB; +border-color: #101C2F; } diff --git a/config/wallust/templates/colors-kitty.conf b/config/wallust/templates/colors-kitty.conf index b88fb4c1..92ceb48c 100644 --- a/config/wallust/templates/colors-kitty.conf +++ b/config/wallust/templates/colors-kitty.conf @@ -1,19 +1,26 @@ font_family Fira Code SemiBold -font_size 13.0 -bold_font auto -italic_font auto -bold_italic_font auto +font_size 16.0 +bold_font auto +italic_font auto +bold_italic_font auto +background_opacity 0.5 confirm_os_window_close 0 +scrollback_lines 2000 +wheel_scroll_min_lines 1 + +enable_audio_bell no + +window_padding_width 4 + +selection_foreground none +selection_background none + foreground {{foreground}} background {{background}} -background_opacity 0.7 cursor {{cursor}} -selection_foreground #000000 -selection_background #F5FBFF - active_tab_foreground {{background}} active_tab_background {{foreground}} inactive_tab_foreground {{foreground}} diff --git a/config/waybar/modules b/config/waybar/modules index 2dc4163c..4590e8c9 100644 --- a/config/waybar/modules +++ b/config/waybar/modules @@ -120,7 +120,7 @@ "4": " ", "5": " ", "6": " ", - "7": "", + "7": "", "8": " ", "9": "", "10": "10", @@ -150,7 +150,8 @@ "class<kitty>": " ", "class<konsole>": " ", "class<thunar>": " ", - "class<discord>": " ", + "class<discord>": " ", + "class<WebCord>": " ", "class<subl>": " ", "class<celluloid>": " ", "class<Cider>": " ", @@ -159,7 +160,8 @@ "class<codeblocks>": " ", "class<mousepad>": " ", "class<libreoffice-writer>": " ", - "class<libreoffice-startcenter>": " " + "class<libreoffice-startcenter>": " ", + "class<com.obsproject.Studio>": " " } }, // for Camilla or Spanish @@ -368,6 +370,7 @@ "cpu": { "format": "{usage}% ", "interval": 1, + "min-length": 5, "format-alt-click": "click", "format-alt": "{icon0}{icon1}{icon2}{icon3} {usage:>2}% ", "format-icons": [ @@ -470,12 +473,12 @@ "format-wifi": "{icon}", "format-ethernet": "", "format-disconnected": "", - "tooltip-format": "{ipaddr} {bandwidthUpBytes} {bandwidthDownBytes}", + "tooltip-format": "{ipaddr} {bandwidthUpBits} {bandwidthDownBits}", "format-linked": " {ifname} (No IP)", "tooltip-format-wifi": "{essid} {icon} {signalStrength}%", "tooltip-format-ethernet": "{ifname} ", "tooltip-format-disconnected": " Disconnected", - "max-length": 50, + "max-length": 30, "format-icons": [ "", "", "", "", "" ], @@ -484,15 +487,16 @@ "network#speed": { "interval": 1, "format": "{ifname}", - "format-wifi": "{icon} {bandwidthUpBytes} {bandwidthDownBytes}", - "format-ethernet": " {bandwidthUpBytes} {bandwidthDownBytes}", + "format-wifi": "{icon} {bandwidthUpBits} {bandwidthDownBits}", + "format-ethernet": " {bandwidthUpBits} {bandwidthDownBits}", "format-disconnected": "", "tooltip-format": "{ipaddr}", "format-linked": " {ifname} (No IP)", "tooltip-format-wifi": "{essid} {icon} {signalStrength}%", "tooltip-format-ethernet": "{ifname} ", "tooltip-format-disconnected": " Disconnected", - "max-length": 50, + "min-length": 24, + "max-length": 24, "format-icons": [ "", "", "", "", "" ] diff --git a/config/waybar/style/[Black & White] Monochrome.css b/config/waybar/style/[Black & White] Monochrome.css index 44b509cd..13f6cdf4 100644 --- a/config/waybar/style/[Black & White] Monochrome.css +++ b/config/waybar/style/[Black & White] Monochrome.css @@ -2,24 +2,20 @@ /* Black & White MonoChrome */ * { -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"'; -} - -window#waybar { - background: transparent; -} - -window#waybar.empty { - background-color: transparent; + 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"'; } +window#waybar, +window#waybar.empty, window#waybar.empty #window { - background-color: transparent; + background-color: transparent; + padding: 0px; + border: 0px; } tooltip { @@ -73,7 +69,9 @@ tooltip label{ padding-left: 4px; } /*-----modules indv----*/ +#taskbar button, #workspaces button { + color: dimgrey; box-shadow: none; text-shadow: none; padding: 0px; @@ -83,15 +81,17 @@ tooltip label{ animation: gradient_f 20s ease-in infinite; transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); } +#taskbar button:hover, #workspaces button:hover { color: white; - background-color: rgba(0,153,153,0.2); + background-color: #7f849c; padding-left: 2px; padding-right: 2px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } +#taskbar button.active, #workspaces button.active { color: white; padding-left: 8px; @@ -161,7 +161,7 @@ tooltip label{ color: #cc3436; } #temperature.critical { - color: #cc3436; + color: red; } @keyframes blink { @@ -179,21 +179,6 @@ tooltip label{ animation-direction: alternate; } -#taskbar button.active { - background-color: #7f849c; - padding-left: 6px; - padding-right: 6px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - -#taskbar button:hover { - padding-left: 2px; - padding-right: 2px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - #pulseaudio-slider slider { min-width: 0px; min-height: 0px; diff --git a/config/waybar/style/[Catppuccin] Latte.css b/config/waybar/style/[Catppuccin] Latte.css index a79f2739..92eac7ff 100644 --- a/config/waybar/style/[Catppuccin] Latte.css +++ b/config/waybar/style/[Catppuccin] Latte.css @@ -15,7 +15,6 @@ font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; window#waybar { transition-property: background-color; transition-duration: 0.5s; - /*background: transparent;*/ border-bottom: 2px solid @sapphire; background: @theme_base_color; border-radius: 10px; @@ -25,23 +24,55 @@ window#waybar.hidden { opacity: 0.2; } -#waybar.empty #window { - background: none; +window#waybar.empty, +window#waybar.empty #window { + background-color: transparent; + padding: 0px; + border: 0px; } -/* 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; */ -/*} */ +#taskbar button, +#workspaces button { + box-shadow: none; + text-shadow: none; + padding: 0px; + border-radius: 9px; + padding-left: 4px; + padding-right: 4px; + animation: gradient_f 20s ease-in infinite; + transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); +} -/* .modules-left, .modules-right { */ -/* border: 1px solid @blue; */ -/* margin: 0px 5px;*/ -/*}*/ +#taskbar button:hover, +#workspaces button:hover { + border-radius: 10px; + color: @overlay0; + background-color: @surface0; + padding-left: 2px; + padding-right: 2px; + animation: gradient_f 20s ease-in infinite; + transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); +} + +#workspaces button.persistent { + color: @surface1; + border-radius: 10px; +} + +#taskbar button.active, +#workspaces button.active { + color: @peach; + border-radius: 10px; + padding-left: 8px; + padding-right: 8px; + animation: gradient_f 20s ease-in infinite; + transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); +} + +#workspaces button.urgent { + color: @red; + border-radius: 0px; +} #backlight, #backlight-slider, @@ -163,59 +194,6 @@ window#waybar.hidden { color: @flamingo; } -#workspaces button { - box-shadow: none; - text-shadow: none; - padding: 0px; - border-radius: 9px; - padding-left: 4px; - padding-right: 4px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); -} - -#workspaces button:hover { - border-radius: 10px; - color: @overlay0; - background-color: @surface0; - padding-left: 2px; - padding-right: 2px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - -#workspaces button.persistent { - color: @surface1; - border-radius: 10px; -} - -#workspaces button.active { - color: @peach; - border-radius: 10px; - padding-left: 8px; - padding-right: 8px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - -#workspaces button.urgent { - color: @red; - border-radius: 0px; -} - -#taskbar button.active { - padding-left: 8px; - padding-right: 8px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - -#taskbar button:hover { - padding-left: 3px; - padding-right: 3px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} #custom-cava_mviz { color: @pink; } @@ -259,7 +237,7 @@ window#waybar.hidden { color: @mauve; } -#custom-waybar-mpris { +#mpris { color:@lavender; } diff --git a/config/waybar/style/[Catppuccin] Mocha.css b/config/waybar/style/[Catppuccin] Mocha.css index 5fb08488..98a4240c 100644 --- a/config/waybar/style/[Catppuccin] Mocha.css +++ b/config/waybar/style/[Catppuccin] Mocha.css @@ -2,31 +2,76 @@ /* Catppuccin Mocha */ * { -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"'; + 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 { - transition-property: background-color; - transition-duration: 0.5s; - background: transparent; - /*border: 2px solid @overlay0;*/ - /*background: @theme_base_color;*/ - border-radius: 10px; + transition-property: background-color; + transition-duration: 0.5s; + background: transparent; + border-radius: 10px; } window#waybar.hidden { - opacity: 0.2; + opacity: 0.2; +} + +window#waybar.empty, +window#waybar.empty #window { + background-color: transparent; + padding: 0px; + border: 0px; +} + +#taskbar button, +#workspaces button { + color: @overlay1; + box-shadow: none; + text-shadow: none; + padding: 0px; + border-radius: 9px; + padding-left: 4px; + padding-right: 4px; + animation: gradient_f 20s ease-in infinite; + transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); +} + +#taskbar button:hover, +#workspaces button:hover { + border-radius: 10px; + color: @peach; + background-color: @surface0; + padding-left: 2px; + padding-right: 2px; + animation: gradient_f 20s ease-in infinite; + transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } -#waybar.empty #window { - background: none; +#workspaces button.persistent { + color: @surface1; + border-radius: 10px; +} + +#taskbar button.active, +#workspaces button.active { + color: @mauve; + border-radius: 10px; + padding-left: 8px; + padding-right: 8px; + animation: gradient_f 20s ease-in infinite; + transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); +} + +#workspaces button.urgent { + color: @red; + border-radius: 0px; } /* This section can be use if you want to separate waybar modules */ @@ -166,60 +211,6 @@ window#waybar.hidden { color: @flamingo; } -#workspaces button { - box-shadow: none; - text-shadow: none; - padding: 0px; - border-radius: 9px; - padding-left: 4px; - padding-right: 4px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); -} - -#workspaces button:hover { - border-radius: 10px; - color: @overlay0; - background-color: @surface0; - padding-left: 2px; - padding-right: 2px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - -#workspaces button.persistent { - color: @surface1; - border-radius: 10px; -} - -#workspaces button.active { - color: @peach; - border-radius: 10px; - padding-left: 8px; - padding-right: 8px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - -#workspaces button.urgent { - color: @red; - border-radius: 0px; -} - -#taskbar button.active { - padding-left: 8px; - padding-right: 8px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - -#taskbar button:hover { - padding-left: 2px; - padding-right: 2px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - #custom-cava_mviz { color: @pink; } @@ -263,7 +254,7 @@ window#waybar.hidden { color: @mauve; } -#custom-waybar-mpris { +#mpris { color:@lavender; } diff --git a/config/waybar/style/[Colored] Chroma Glow.css b/config/waybar/style/[Colored] Chroma Glow.css index 35ee0629..05a3013e 100644 --- a/config/waybar/style/[Colored] Chroma Glow.css +++ b/config/waybar/style/[Colored] Chroma Glow.css @@ -2,12 +2,12 @@ /* Chroma Glow */ * { -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"'; + 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"'; } window#waybar { @@ -22,10 +22,7 @@ window#waybar.hidden { opacity: 0.1; } -window#waybar.empty { - background-color: transparent; -} - +window#waybar.empty, window#waybar.empty #window { padding: 0px; border: 0px; @@ -46,6 +43,7 @@ tooltip label{ color: #cdd6f4; } +#taskbar button, #workspaces button { background-color: transparent; color: grey; @@ -59,6 +57,7 @@ tooltip label{ transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); } +#taskbar button.active, #workspaces button.active { background-color: transparent; color: #D3D3D3; @@ -68,6 +67,7 @@ tooltip label{ transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } +#taskbar button:hover, #workspaces button:hover { background: rgba(0, 0, 0, 0.2); color: #D3D3D3; @@ -80,7 +80,6 @@ tooltip label{ #workspaces button.focused { background-color: #bbccdd; color: #323232; - /* box-shadow: inset 0 -3px #ffffff; */ } #workspaces button.urgent { @@ -142,10 +141,6 @@ tooltip label{ padding-left: 6px; } -#window, -#workspaces { -} - /* If workspaces is the leftmost module, omit left margin */ .modules-left > widget:first-child > #workspaces { } @@ -280,21 +275,6 @@ label:focus { /*color: #2d3436;*/ } -#taskbar button.active { - background-color: #7f849c; - padding-left: 12px; - padding-right: 12px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - -#taskbar button:hover { - padding-left: 3px; - padding-right: 3px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - #mpd { color: #2a5c45; } diff --git a/config/waybar/style/[Colored] Translucent.css b/config/waybar/style/[Colored] Translucent.css index edddce42..8d6aab16 100644 --- a/config/waybar/style/[Colored] Translucent.css +++ b/config/waybar/style/[Colored] Translucent.css @@ -36,14 +36,10 @@ window#waybar.hidden { opacity: 0.1; } -window#waybar.empty { - background-color: transparent; -} - +window#waybar.empty, window#waybar.empty #window { padding: 0px; border: 0px; - /* background-color: rgba(66,66,66,0.5); */ /* transparent */ background-color: transparent; } @@ -69,6 +65,7 @@ tooltip { transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); } +#taskbar button.active, #workspaces button.active { background-color: transparent; color: @accent1; @@ -78,6 +75,7 @@ tooltip { transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } +#taskbar button:hover, #workspaces button:hover { background: rgba(0, 0, 0, 0.2); color: @accent3; @@ -185,7 +183,7 @@ tooltip { } #battery.critical:not(.charging) { - color: #f53c3c; + color: @critical; animation-name: blink; animation-duration: 0.5s; animation-timing-function: linear; @@ -295,21 +293,6 @@ label:focus { /*color: #2d3436;*/ } -#taskbar button.active { - background-color: #7f849c; - padding-left: 12px; - padding-right: 12px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - -#taskbar button:hover { - padding-left: 3px; - padding-right: 3px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - #mpd { color: #2a5c45; } diff --git a/config/waybar/style/[Colorful] Aurora Blossom.css b/config/waybar/style/[Colorful] Aurora Blossom.css index b7fd25d4..e29ab9a7 100644 --- a/config/waybar/style/[Colorful] Aurora Blossom.css +++ b/config/waybar/style/[Colorful] Aurora Blossom.css @@ -2,23 +2,22 @@ /* Aurora Blossom */ * { -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%; -font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; + 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%; + font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; } window#waybar { background: transparent; } -window#waybar.empty { - background-color: transparent; -} - +window#waybar.empty , window#waybar.empty #window { background-color: transparent; + padding: 0px; + border: 0px; } tooltip { diff --git a/config/waybar/style/[Colorful] Aurora.css b/config/waybar/style/[Colorful] Aurora.css index 4a05258b..55dffc62 100644 --- a/config/waybar/style/[Colorful] Aurora.css +++ b/config/waybar/style/[Colorful] Aurora.css @@ -9,16 +9,12 @@ font-size: 97%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; } -window#waybar { - background: transparent; -} - -window#waybar.empty { - background-color: transparent; -} - +window#waybar, +window#waybar.empty, window#waybar.empty #window { - background-color: transparent; + background-color: transparent; + padding: 0px; + border: 0px; } tooltip { @@ -51,8 +47,9 @@ tooltip label{ padding-left: 4px; } /*-----modules indv----*/ +#taskbar button, #workspaces button { - color: black; + color: grey; box-shadow: none; text-shadow: none; padding: 0px; @@ -62,17 +59,18 @@ tooltip label{ animation: gradient_f 20s ease-in infinite; transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); } +#taskbar button:hover, #workspaces button:hover { - color: grey; + color: black; background-color: rgba(0,153,153,0.2); padding-left: 2px; padding-right: 2px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } - +#taskbar button.active, #workspaces button.active { - color: grey; + color: black; padding-left: 8px; padding-right: 8px; animation: gradient_f 20s ease-in infinite; @@ -138,12 +136,22 @@ tooltip label{ padding-right: 6px; padding-left: 6px; } - +#backlight { + padding-right: 2px; +} #custom-power { padding-left: 10px; padding-right: 2px; } - +#custom-menu { + padding-right: 8px; +} +#custom-cycle_wall { + padding-right: 2px; +} +#network { + padding-right: 12px; +} /*-----Indicators----*/ #idle_inhibitor.activated { color: #2dcc36; @@ -152,7 +160,8 @@ tooltip label{ color: #cc3436; } #temperature.critical { - color: #cc3436; + background: red; + color: black; } @keyframes blink { @@ -170,24 +179,6 @@ tooltip label{ animation-direction: alternate; } -#taskbar button.active { - color: black; - background-color: #7f849c; - padding-left: 6px; - padding-right: 6px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - -#taskbar button, -#taskbar button:hover { - color: black; - padding-left: 2px; - padding-right: 2px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - #pulseaudio-slider slider { min-width: 0px; min-height: 0px; diff --git a/config/waybar/style/[Colorful] Rainbow Spectrum.css b/config/waybar/style/[Colorful] Rainbow Spectrum.css index 550d2866..03096358 100644 --- a/config/waybar/style/[Colorful] Rainbow Spectrum.css +++ b/config/waybar/style/[Colorful] Rainbow Spectrum.css @@ -11,10 +11,7 @@ font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; } window#waybar { - /* Transparent waybar. Make sure to comment out background-color: and border: */ background-color: rgba(0,0,0,0); - /* background-color: #1e1e2e; */ - /* border: 2px solid #313244; */ transition-property: background-color; transition-duration: .5s; } @@ -23,14 +20,10 @@ window#waybar.hidden { opacity: 0.5; } -window#waybar.empty { - background-color: transparent; -} - +window#waybar.empty, window#waybar.empty #window { padding: 0px; border: 0px; - /* background-color: rgba(66,66,66,0.5); */ /* transparent */ background-color: transparent; } @@ -47,6 +40,40 @@ tooltip label{ color: #cdd6f4; } +#taskbar button, +#workspaces button { + background-color: #d9e0ee; + color: #3A3B3C; + box-shadow: none; + text-shadow: none; + padding: 0px; + border-radius: 9px; + padding-left: 4px; + padding-right: 4px; + 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 { + background-color: #eba0ac; + color: #3A3B3C; + padding-left: 8px; + padding-right: 8px; + animation: gradient_f 20s ease-in infinite; + transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); +} + +#taskbar button:hover, +#workspaces button:hover { + background: #eb6f92; + color: #f6c177; + padding-left: 3px; + padding-right: 3px; + animation: gradient_f 20s ease-in infinite; + transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); +} + #backlight, #backlight-slider, #battery, @@ -105,14 +132,6 @@ tooltip label{ background-color: #cba6f7; } -#taskbar { - color: #ffffff; -} - -#taskbar button.active { - background-color: #7f849c; -} - #battery { background-color: #f9e2af; } @@ -167,59 +186,6 @@ tooltip label{ -gtk-icon-effect: highlight; } -#workspaces button { - background-color: #d9e0ee; - color: #3A3B3C; - box-shadow: none; - text-shadow: none; - padding: 0px; - border-radius: 9px; - padding-left: 4px; - padding-right: 4px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); -} - -#workspaces button.active { - background-color: #eba0ac; - color: #3A3B3C; - padding-left: 8px; - padding-right: 8px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - -#workspaces button:hover { - background: #eb6f92; - color: #f6c177; - padding-left: 3px; - padding-right: 3px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - -#taskbar button { - border-radius: 8px; - background-color: #74c7ec; - color: #3A3B3C; -} - -#taskbar button.active { - background-color: #b4befe; - color: #3A3B3C; - padding-left: 8px; - padding-right: 8px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - -#taskbar button:hover { - padding-left: 3px; - padding-right: 3px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - #custom-menu { background-color: #f5c2e7; /*padding: 1px;*/ @@ -296,6 +262,7 @@ tooltip label{ #network { background-color: #89b4fa; + padding-right: 12px; } #network.disconnected,#network.disabled { background-color: #313244; diff --git a/config/waybar/style/[Dark] Golden Noir.css b/config/waybar/style/[Dark] Golden Noir.css index a0e0acea..96ac0b90 100644 --- a/config/waybar/style/[Dark] Golden Noir.css +++ b/config/waybar/style/[Dark] Golden Noir.css @@ -4,7 +4,6 @@ /* .......................................... */ /* --- 👍 designed by https://github.com/Krautt 👍 --- */ - * { font-family: "JetBrainsMono Nerd Font"; font-weight: bold; @@ -25,19 +24,13 @@ window#waybar.hidden { opacity: 0.5; } -window#waybar.empty { - background-color: #040406; -} - +window#waybar.empty, 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; @@ -85,6 +78,7 @@ tooltip { transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); } +#taskbar button.active, #workspaces button.active { color: #ffd700; border-radius: 50%; @@ -105,6 +99,7 @@ tooltip { border-radius: 10px; } +#taskbar button:hover, #workspaces button:hover { color: #ffd700; border-radius: 15px; @@ -114,10 +109,6 @@ tooltip { transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } -#clock#2 { - color: #cba6f7; -} - #backlight, #backlight-slider, #battery, @@ -180,21 +171,6 @@ tooltip { } } -#taskbar button.active { - background-color: rgb(47, 46, 46); - padding-left: 12px; - padding-right: 12px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - -#taskbar button:hover { - padding-left: 3px; - padding-right: 3px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - #battery.critical:not(.charging) { color: #f53c3c; animation-name: blink; diff --git a/config/waybar/style/[Dark] Half-Moon.css b/config/waybar/style/[Dark] Half-Moon.css index 947bde9b..67cb4f97 100644 --- a/config/waybar/style/[Dark] Half-Moon.css +++ b/config/waybar/style/[Dark] Half-Moon.css @@ -5,11 +5,15 @@ /* --- 👍 shared by https://github.com/TomekBobrowicz 👍 --- */ * { -font-size: 97%; -font-family: "JetBrainsMono Nerd Font", "Font Awesome", sans-serif; -font-weight: bold; + 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"'; } + window#waybar { background-color: rgba(26,27,38,0); border-bottom: 1px solid rgba(26,27,38,0); @@ -17,6 +21,15 @@ window#waybar { color: #E6B673; } +#waybar.empty, #waybar.tiled, #waybar.floating { + background-color: transparent; +} + +window#waybar.empty, +window#waybar.empty #window { + background-color: transparent; +} + #taskbar, #workspaces { background: #0F1419; @@ -155,6 +168,15 @@ color: #F3F4F5; padding: 2px 15px; } +#mpris { + color: #F07178; + background: #0F1419; + border-radius: 50px 50px; + margin: 5px; + padding-left: 8px; + padding-right: 2px; +} + #backlight { color: white; background: #0F1419; diff --git a/config/waybar/style/[Dark] Latte-Wallust combined.css b/config/waybar/style/[Dark] Latte-Wallust combined.css index 79041091..c0cf90a3 100644 --- a/config/waybar/style/[Dark] Latte-Wallust combined.css +++ b/config/waybar/style/[Dark] Latte-Wallust combined.css @@ -39,20 +39,13 @@ window#waybar.hidden { opacity: 0; } -window#waybar.empty { - /*background-color: #040406;*/ - background-color: transparent; -} - +window#waybar.empty, 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: 5px; @@ -78,8 +71,6 @@ tooltip { background-color: @background-module; border-radius:15px; border-bottom:2px solid @border-color; - /*border-right: 2px solid #ffd700;*/ - /*border:@teal-trans;*/ padding-top: 2px; padding-bottom: 0px; padding-right: 4px; diff --git a/config/waybar/style/[Dark] Purpl.css b/config/waybar/style/[Dark] Purpl.css index 3dbd99da..ed06d3b5 100644 --- a/config/waybar/style/[Dark] Purpl.css +++ b/config/waybar/style/[Dark] Purpl.css @@ -22,16 +22,10 @@ window#waybar.hidden { opacity: 0.5; } -window#waybar.empty { - background-color: transparent; - background: #100214; -} - +window#waybar.empty, window#waybar.empty #window { padding: 0px; border: 0px; - /* background-color: rgba(66,66,66,0.5); */ - /* transparent */ background-color: transparent; } @@ -60,8 +54,6 @@ tooltip { padding-bottom: 2px; padding-right: 4px; padding-left: 4px; - - } .modules-left { @@ -165,7 +157,6 @@ tooltip { padding-bottom: 4px; padding-right: 6px; padding-left: 6px; - } #temperature.critical { diff --git a/config/waybar/style/[Dark] Wallust Obsidian Edge.css b/config/waybar/style/[Dark] Wallust Obsidian Edge.css index d841e3c4..06385e44 100644 --- a/config/waybar/style/[Dark] Wallust Obsidian Edge.css +++ b/config/waybar/style/[Dark] Wallust Obsidian Edge.css @@ -21,10 +21,7 @@ window#waybar.hidden { opacity: 0.5; } -window#waybar.empty { - background-color: transparent; -} - +window#waybar.empty, window#waybar.empty #window { padding: 0px; border: 0px; @@ -72,6 +69,7 @@ tooltip label { padding-left: 4px; } +#taskbar button, #workspaces button { color: @color12; box-shadow: none; @@ -84,6 +82,7 @@ tooltip label { transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); } +#taskbar button.active, #workspaces button.active { color: @foreground; border-radius: 15px 15px 15px 15px; @@ -102,8 +101,9 @@ tooltip label { border-radius: 10px; } +#taskbar button:hover, #workspaces button:hover { - color: #9CCFD8; + color: @color9; border-radius: 15px; padding-left: 2px; padding-right: 2px; @@ -174,21 +174,6 @@ tooltip label { } } -#taskbar button.active { - background-color: #7f849c; - padding-left: 12px; - padding-right: 12px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - -#taskbar button:hover { - padding-left: 3px; - padding-right: 3px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - #battery.critical:not(.charging) { color: #f53c3c; animation-name: blink; diff --git a/config/waybar/style/[Extra] Crimson.css b/config/waybar/style/[Extra] Crimson.css index 63992515..89dbb93a 100644 --- a/config/waybar/style/[Extra] Crimson.css +++ b/config/waybar/style/[Extra] Crimson.css @@ -22,14 +22,10 @@ window#waybar { window#waybar.hidden { opacity: 0.5; } -window#waybar.empty { - -} - +window#waybar.empty, window#waybar.empty #window { padding: 0px; border: 0px; - /* background-color: rgba(66,66,66,0.5); */ /* transparent */ background-color: transparent; } @@ -75,7 +71,8 @@ tooltip { 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: rgb(108, 18, 18); background-color: #000000; @@ -95,7 +92,8 @@ tooltip { color: #11111b; border-radius: 10px; } - + +#taskbar button:hover, #workspaces button:hover { color: rgb(71, 14, 14); background-color: #000000; @@ -166,24 +164,7 @@ tooltip { color: #000000; } } - -#taskbar button.active { - background-color: rgb(128, 31, 31); - border-radius: 8px; - border: 1px solid grey; - padding-left: 12px; - padding-right: 12px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - -#workspaces button:hover { - padding-left: 3px; - padding-right: 3px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - + #battery.critical:not(.charging) { color: #f53c3c; animation-name: blink; diff --git a/config/waybar/style/[Extra] Mauve.css b/config/waybar/style/[Extra] Mauve.css index cfdec9a1..120b5389 100644 --- a/config/waybar/style/[Extra] Mauve.css +++ b/config/waybar/style/[Extra] Mauve.css @@ -16,23 +16,16 @@ window#waybar { background: #11111b; color: #cba6f7; - /* background-color: transparent; */ } window#waybar.hidden { opacity: 0.5; } -window#waybar.empty { - background-color: transparent; - background: #11111b; -} - +window#waybar.empty, window#waybar.empty #window { padding: 0px; border: 0px; - /* background-color: rgba(66,66,66,0.5); */ - /* transparent */ background-color: transparent; } @@ -49,7 +42,7 @@ tooltip { .modules-right { border: 3px solid #11111b; border-radius: 10px 10px 10px 10px; - background-color: #1e1e2e; + background-color: #313244; padding-top: 2px; padding-bottom: 2px; padding-right: 4px; @@ -67,7 +60,7 @@ tooltip { /*background-color: #1e1e2e;*/ border: 3px solid #11111b; border-radius: 10px 10px 10px 10px; - background-color: #1e1e2e; + background-color: #313244; padding-top: 2px; padding-bottom: 2px; padding-right: 4px; @@ -86,6 +79,7 @@ tooltip { transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); } +#taskbar button.active, #workspaces button.active { color: #1e1e1e; border-radius: 30%; @@ -100,7 +94,6 @@ tooltip { color: #1e1e1e; border-radius: 30%; background-color: #cba6f7; - border: 0px solid #1e1e2e; padding-left: 6px; padding-right: 8px; } @@ -115,6 +108,7 @@ tooltip { color: #1e1e1e; } +#taskbar button:hover, #workspaces button:hover { color: #1e1e1e; border: 3px solid #1e1e2e; @@ -189,21 +183,6 @@ tooltip { } } -#taskbar button.active { - background-color: purple; - padding-left: 12px; - padding-right: 12px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - -#taskbar button:hover { - padding-left: 3px; - padding-right: 3px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - #battery.critical:not(.charging) { color: #f53c3c; animation-name: blink; diff --git a/config/waybar/style/[Extra] Rose Pine.css b/config/waybar/style/[Extra] Rose Pine.css index 40536ff9..411c96e5 100644 --- a/config/waybar/style/[Extra] Rose Pine.css +++ b/config/waybar/style/[Extra] Rose Pine.css @@ -23,6 +23,13 @@ window#waybar { background: @bar-bg; } +window#waybar.empty, +window#waybar.empty #window { + background-color: transparent; + padding: 0px; + border: 0px; +} + tooltip { background: @main-bg; color: @main-fg; @@ -38,8 +45,8 @@ tooltip { border-color: #2B5D34; border-style: solid; border-radius: 10px; - padding-left: 3px; - padding-right: 3px; + padding-left: 2px; + padding-right: 4px; background: @main-bg; color: @main-fg; animation: gradient_f 20s ease-in infinite; @@ -49,8 +56,8 @@ tooltip { #workspaces button.active { background: @wb-act-bg; color: @wb-act-fg; - padding-left: 8px; - padding-right: 8px; + padding-left: 2px; + padding-right: 4px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } @@ -155,9 +162,15 @@ tooltip { } #temperature.critical { - background-color: @red; + background-color: red; } +#backlight { + padding-right: 2px; +} +#network { + padding-right: 12px; +} #custom-power { padding-right: 1px; } diff --git a/config/waybar/style/[Extra] Simple Pink.css b/config/waybar/style/[Extra] Simple Pink.css index df7056b9..45cd0dad 100644 --- a/config/waybar/style/[Extra] Simple Pink.css +++ b/config/waybar/style/[Extra] Simple Pink.css @@ -11,7 +11,6 @@ /* 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"'; - } window#waybar { @@ -24,15 +23,10 @@ window#waybar.hidden { opacity: 0.5; } -window#waybar.empty { - background-color: black; -} - +window#waybar.empty, window#waybar.empty #window { padding: 0px; border: 0px; - /* background-color: rgba(66,66,66,0.5); */ - /* transparent */ background-color: transparent; } @@ -63,8 +57,6 @@ tooltip { padding-bottom: 2px; padding-right: 4px; padding-left: 4px; - - } .modules-left { diff --git a/config/waybar/style/[Light] Monochrome Contrast.css b/config/waybar/style/[Light] Monochrome Contrast.css index b188f99a..83524d39 100644 --- a/config/waybar/style/[Light] Monochrome Contrast.css +++ b/config/waybar/style/[Light] Monochrome Contrast.css @@ -10,16 +10,12 @@ font-size: 97%; font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; } -window#waybar { - background: transparent; -} - -window#waybar.empty { - background-color: transparent; -} - +window#waybar, +window#waybar.empty, window#waybar.empty #window { - background-color: transparent; + background-color: transparent; + padding: 0px; + border: 0px; } tooltip { @@ -73,6 +69,7 @@ tooltip label{ padding-left: 4px; } /*-----modules indv----*/ +#taskbar button, #workspaces button { color: black; box-shadow: none; @@ -84,6 +81,7 @@ tooltip label{ animation: gradient_f 20s ease-in infinite; transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); } +#taskbar button:hover, #workspaces button:hover { color: grey; background-color: rgba(0,153,153,0.2); @@ -93,8 +91,10 @@ tooltip label{ transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); } +#taskbar button.active, #workspaces button.active { - color: grey; + background-color: grey; + color: black; padding-left: 8px; padding-right: 8px; animation: gradient_f 20s ease-in infinite; @@ -183,21 +183,6 @@ tooltip label{ animation-direction: alternate; } -#taskbar button.active { - background-color: #7f849c; - padding-left: 6px; - padding-right: 6px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - -#taskbar button:hover { - padding-left: 2px; - padding-right: 2px; - animation: gradient_f 20s ease-in infinite; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); -} - #pulseaudio-slider slider { min-width: 0px; min-height: 0px; diff --git a/config/waybar/style/[Light] Obsidian Glow.css b/config/waybar/style/[Light] Obsidian Glow.css index 5b6fe9ba..001117f5 100644 --- a/config/waybar/style/[Light] Obsidian Glow.css +++ b/config/waybar/style/[Light] Obsidian Glow.css @@ -19,10 +19,7 @@ window#waybar.hidden { opacity: 0.7; } -window#waybar.empty { - background-color: transparent; -} - +window#waybar.empty, window#waybar.empty #window { padding: 0px; border: 0px; @@ -54,6 +51,7 @@ tooltip label { } #workspaces button.active { + background-color: dimgrey; color: #000000; border-radius: 15px 15px 15px 15px; padding-left: 8px; diff --git a/config/waybar/style/[Retro] Simple Style.css b/config/waybar/style/[Retro] Simple Style.css index 83c26494..f966b858 100644 --- a/config/waybar/style/[Retro] Simple Style.css +++ b/config/waybar/style/[Retro] Simple Style.css @@ -1,7 +1,6 @@ /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ /* Simple Style */ - @define-color background #1d2021; @define-color foreground #ebdbb2; @define-color dim #928374; @@ -10,11 +9,13 @@ @define-color green #b8bb26; * { - background: @background; - border: none; - border-radius: 0; - font-family: "JetBrainsMono Nerd Font"; - font-size: 97%; + 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"'; + } window#waybar { @@ -31,16 +32,16 @@ window#waybar { #taskbar button.active, #workspaces button.active { - border-bottom: 1px solid @green; + border-bottom: 1px solid green; } #taskbar button.urgent, #workspaces button.urgent { - border-bottom: 2px solid @red; + border-bottom: 2px solid red; } #submap { - border-bottom: 1px solid @red; + border-bottom: 1px solid red; } #backlight, @@ -97,7 +98,7 @@ window#waybar { #memory.warning, #cpu.warning { border-top: 3px solid @background; - border-bottom: 3px solid @yellow; + border-bottom: 3px solid yellow; } #battery.critical, @@ -105,12 +106,16 @@ window#waybar { #memory.critical, #cpu.critical { border-top: 3px solid @background; - border-bottom: 3px solid @red; + border-bottom: 3px solid red; +} + +#temperature.critical { + background-color: red; } #battery.charging { border-top: 3px solid @background; - border-bottom: 3px solid @green; + border-bottom: 3px solid green; } #pulseaudio-slider slider { diff --git a/config/waybar/style/[Transparent] Crystal Clear.css b/config/waybar/style/[Transparent] Crystal Clear.css index fb2710ae..7bf67f9b 100644 --- a/config/waybar/style/[Transparent] Crystal Clear.css +++ b/config/waybar/style/[Transparent] Crystal Clear.css @@ -22,30 +22,14 @@ window#waybar { window#waybar.hidden { opacity: 0.5; } -window#waybar.empty { - background-color: transparent; -} - + +window#waybar.empty window#waybar.empty #window { padding: 0px; border: 0px; background-color: transparent; } - -/*-----module groups----*/ -.modules-right { - -} - -.modules-center { - -} - -.modules-left { - -} - #workspaces button { color: #6E6A86; box-shadow: none; diff --git a/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css b/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css index 233763c6..198fd450 100644 --- a/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css +++ b/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css @@ -40,10 +40,11 @@ window#waybar { border:2px solid black; } -window#waybar.empty #window { +window#waybar.empty, +window#waybar.empty #window { background-color: transparent; + padding: 0px; border: 0px; - } tooltip { @@ -66,6 +67,7 @@ tooltip { #keyboard-state, #memory, #mode, +#mpris, #network, #power-profiles-daemon, #pulseaudio, @@ -100,13 +102,13 @@ tooltip { background-color: @background-module; border-radius: 25px; padding: 0px 10px 0px 10px; - margin: 5px 5px 5px 5px; + margin: 5px; opacity:0.8; border:2px solid @border-color; } #custom-power { - color: @red; + color: red; padding: 0px 0px 0px 7px; opacity:1.0; } @@ -125,15 +127,24 @@ tooltip { color: @yellow; } +#mpris { + padding-right: 2px; +} + #keyboard-state, #clock { color: @sapphire; } -#network, + #temperature { color: @rosewater; } +#network { + padding-left: 2px; + color: @rosewater; +} + #custom-swaync, #custom-hint, #tray { @@ -162,19 +173,15 @@ tooltip { color: @color2; } #workspaces { - margin: 1px 1px 1px 1px; - padding: 0px 1px; border-radius: 25px; border:2px solid @border-color; - font-weight: bold; - font-style: normal; opacity:0.8; color:#FFFFFF; + margin: 6px; } #workspaces button { - margin: 1px 1px; border-radius: 15px; border:0px; color: @color13; @@ -185,12 +192,10 @@ tooltip { opacity:0.8; } -#workspaces button.active, -#workspaces button.visible { +#workspaces button.active { color: #FFFFFF; background: @button-color; - border-radius: 15px; - border: 1px solid @border-color; + border-radius: 25px; padding-left: 4px; padding-right: 4px; animation: gradient_f 20s ease-in infinite; @@ -206,7 +211,6 @@ tooltip { #workspaces button:hover { color: #FFFFFF; background: @button-hover; - border: 1px solid @border-color; border-radius: 15px; opacity:1.0; padding-left: 2px; @@ -241,7 +245,7 @@ tooltip { } #temperature.critical { - background-color: @red; + background-color: red; } @keyframes blink { diff --git a/config/waybar/style/[Wallust Bordered] Chroma Simple.css b/config/waybar/style/[Wallust Bordered] Chroma Simple.css index ce5f3fc3..047a91c3 100644 --- a/config/waybar/style/[Wallust Bordered] Chroma Simple.css +++ b/config/waybar/style/[Wallust Bordered] Chroma Simple.css @@ -19,11 +19,11 @@ window#waybar { padding-right: 15px; } +window#waybar.empty, window#waybar.empty #window { background-color: transparent; - border-color: transparent; - padding-left: 15px; - padding-right: 15px; + padding: 0px; + border: 0px; } tooltip { @@ -91,6 +91,7 @@ tooltip { #keyboard-state, #memory, #mode, +#mpris, #network, #power-profiles-daemon, #pulseaudio, @@ -181,7 +182,7 @@ tooltip { } #mpris { - padding-left: 15px; + padding-left: 16px; } #tray.empty { background-color: transparent; diff --git a/config/waybar/style/[Wallust Transparent] Crystal Clear.css b/config/waybar/style/[Wallust Transparent] Crystal Clear.css index b8739911..d6060407 100644 --- a/config/waybar/style/[Wallust Transparent] Crystal Clear.css +++ b/config/waybar/style/[Wallust Transparent] Crystal Clear.css @@ -38,8 +38,7 @@ window#waybar.empty #window { padding: 0px; border: 0px; background-color: transparent; -} - +} /*-----module groups----*/ .modules-right { diff --git a/config/waybar/style/[Wallust] Box type.css b/config/waybar/style/[Wallust] Box type.css index a5338e84..0bdf607b 100644 --- a/config/waybar/style/[Wallust] Box type.css +++ b/config/waybar/style/[Wallust] Box type.css @@ -22,11 +22,11 @@ window#waybar.hidden { } -window#waybar.empty #window { - background:none; - border-bottom-width: 5px; - border-bottom-color: transparent; - border-bottom-style: solid; +window#waybar.empty, +window#waybar.empty #window { + background-color: transparent; + padding: 0px; + border: 0px; } #window { @@ -91,6 +91,7 @@ window#waybar.empty #window { #keyboard-state, #memory, #mode, +#mpris, #network, #power-profiles-daemon, #pulseaudio, @@ -144,10 +145,18 @@ window#waybar.empty #window { padding-right: 12px; } +#temperature.critical { + background-color: red; + color: black; +} + #mpris { - padding-right: 8px; + padding-right: 2px; padding-left: 8px; } +#backlight { + padding-right: 2px; +} #battery.critical:not(.charging) { background-color: #ffffff; color: #000000; diff --git a/config/waybar/style/[Wallust] Chroma Edge.css b/config/waybar/style/[Wallust] Chroma Edge.css index 28be5dee..6dea2949 100644 --- a/config/waybar/style/[Wallust] Chroma Edge.css +++ b/config/waybar/style/[Wallust] Chroma Edge.css @@ -22,13 +22,11 @@ window#waybar { border-radius: 0px; transition-duration: 0.5s; } -window#waybar.empty { - background-color: transparent; -} + +window#waybar.empty window#waybar.empty #window { padding: 0px; border: 0px; - /* background-color: rgba(66,66,66,0.5); */ /* transparent */ background-color: transparent; } @@ -84,7 +82,6 @@ tooltip label{ background-color: #eb4d4b; } - #backlight, #backlight-slider, #battery, @@ -222,8 +219,8 @@ tooltip label{ color: #FFD580; } #backlight { - /* color: #EBCB8B; */ color: #8fbcbb; + padding-right: 2px; } #clock { diff --git a/config/waybar/style/[Wallust] Chroma Fusion.css b/config/waybar/style/[Wallust] Chroma Fusion.css index 368c99e3..cb1abdf3 100644 --- a/config/waybar/style/[Wallust] Chroma Fusion.css +++ b/config/waybar/style/[Wallust] Chroma Fusion.css @@ -39,10 +39,11 @@ window#waybar { border-top-right-radius: 20px; } -window#waybar.empty #window { +window#waybar.empty, +window#waybar.empty #window { background-color: transparent; + padding: 0px; border: 0px; - } tooltip { @@ -65,6 +66,7 @@ tooltip { #keyboard-state, #memory, #mode, +#mpris, #network, #power-profiles-daemon, #pulseaudio, @@ -110,7 +112,7 @@ tooltip { padding: 0px 2px 0px 6px; } #custom-power { - color: @red; + color: red; padding: 0px 0px 0px 6px; opacity:1.0; } @@ -121,6 +123,11 @@ tooltip { opacity:1.0; } +#mpris { + color: @sapphire; + padding-right: 0px; +} + #custom-swaync, #custom-weather, #custom-updater { @@ -179,20 +186,19 @@ tooltip { border-radius: 15px; border:0px; color: @color13; - padding-left: 4px; - padding-right: 4px; + padding-left: 2px; + padding-right: 2px; animation: gradient_f 20s ease-in infinite; transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682); opacity:0.8; } -#workspaces button.active, -#workspaces button.visible { +#workspaces button.active { color: #FFFFFF; background: @button-color; border-radius: 15px; - padding-left: 8px; - padding-right: 8px; + padding-left: 4px; + padding-right: 4px; animation: gradient_f 20s ease-in infinite; transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); opacity:1.0; @@ -240,7 +246,7 @@ tooltip { } #temperature.critical { - background-color: @red; + background-color: red; } @keyframes blink { diff --git a/config/waybar/style/[Wallust] Chroma Tally.css b/config/waybar/style/[Wallust] Chroma Tally.css index 4b7ad61e..ec6b6e14 100644 --- a/config/waybar/style/[Wallust] Chroma Tally.css +++ b/config/waybar/style/[Wallust] Chroma Tally.css @@ -20,8 +20,15 @@ window#waybar { border-color: @color12; } +window#waybar.empty, +window#waybar.empty #window { + background-color: transparent; + padding: 0px; + border: 0px; +} + #workspaces { - background: #0F1419; + background: transparent; padding: 0px 1px; border-radius: 15px; border: 0px; @@ -208,6 +215,7 @@ tooltip { #custom-swaync, #custom-menu { color: yellow; + padding-left: 8px; } #custom-power{ color: #eba0ac; diff --git a/config/waybar/style/[Wallust] Colored.css b/config/waybar/style/[Wallust] Colored.css index 8d73d52e..ba4e3163 100644 --- a/config/waybar/style/[Wallust] Colored.css +++ b/config/waybar/style/[Wallust] Colored.css @@ -12,18 +12,11 @@ font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; } -window#waybar { - background: transparent; -} - window#waybar.hidden { opacity: 0.5; } -window#waybar.empty { - background-color: @background; -} - +window#waybar, window#waybar.empty #window { padding: 0px; border: 0px; diff --git a/config/waybar/style/[Wallust] Simple.css b/config/waybar/style/[Wallust] Simple.css index e2a27636..d68d3a6e 100644 --- a/config/waybar/style/[Wallust] Simple.css +++ b/config/waybar/style/[Wallust] Simple.css @@ -12,14 +12,18 @@ font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"'; @import '../../.config/waybar/wallust/colors-waybar.css'; -window#waybar { - background: transparent; -} - #waybar.empty, #waybar.tiled, #waybar.floating { background-color: transparent; } +window#waybar, +window#waybar.empty, +window#waybar.empty #window { + background-color: transparent; + padding: 0px; + border: 0px; +} + tooltip { color: @color15; background: @color0; diff --git a/config/waybar/wallust/colors-waybar.css b/config/waybar/wallust/colors-waybar.css index f5f61061..c8106142 100644 --- a/config/waybar/wallust/colors-waybar.css +++ b/config/waybar/wallust/colors-waybar.css @@ -1,20 +1,20 @@ -@define-color foreground #BFBEB7; -@define-color background rgba(2,3,2,0.25); -@define-color cursor #BFBEB7; +@define-color foreground #D6CBD5; +@define-color background rgba(3,5,8,0.25); +@define-color cursor #D6CBD5; -@define-color color0 #020302; -@define-color color1 #171812; -@define-color color2 #1F1E16; -@define-color color3 #26251B; -@define-color color4 #2E2C20; -@define-color color5 #363324; -@define-color color6 #363324; -@define-color color7 #9B998F; -@define-color color8 #6C6B64; -@define-color color9 #1F1F18; -@define-color color10 #29291E; -@define-color color11 #333224; -@define-color color12 #3E3B2A; -@define-color color13 #484430; -@define-color color14 #484430; -@define-color color15 #9B998F; +@define-color color0 #030508; +@define-color color1 #0C1523; +@define-color color2 #2A3859; +@define-color color3 #324166; +@define-color color4 #205F36; +@define-color color5 #11606B; +@define-color color6 #685066; +@define-color color7 #BCADBB; +@define-color color8 #847983; +@define-color color9 #101C2F; +@define-color color10 #384B76; +@define-color color11 #425788; +@define-color color12 #2B7F48; +@define-color color13 #16808F; +@define-color color14 #8A6B88; +@define-color color15 #BCADBB; @@ -14,11 +14,12 @@ if [[ $EUID -eq 0 ]]; then exit 1 fi -printf "\n%.0s" {1..3} -echo " _ _ ___ __ " -echo " | _. |/ _ _ | o _|_ __ | \ / \ | (_ " -echo " \_| (_| o |\ (_) (_) |_ | |_ |_/ \_/ | __) " +printf "\n%.0s" {1..2} +echo ' ╦╔═┌─┐┌─┐╦ ╦ ╦┬ ┬┌─┐┬─┐┬ ┌─┐┌┐┌┌┬┐ ╔╦╗┌─┐┌┬┐┌─┐ ' +echo ' ╠╩╗│ ││ │║ ╠═╣└┬┘├─┘├┬┘│ ├─┤│││ ││───║║│ │ │ └─┐ ' +echo ' ╩ ╩└─┘└─┘╩═╝ ╩ ╩ ┴ ┴ ┴└─┴─┘┴ ┴┘└┘─┴┘ ═╩╝└─┘ ┴ └─┘ ' printf "\n%.0s" {1..2} + # Set some colors for output messages OK="$(tput setaf 2)[OK]$(tput sgr0)" @@ -43,7 +44,7 @@ xdg-user-dirs-update 2>&1 | tee -a "$LOG" || true # uncommenting WLR_NO_HARDWARE_CURSORS if nvidia is detected if lspci -k | grep -A 2 -E "(VGA|3D)" | grep -iq nvidia; then - # NVIDIA GPU detected, uncomment line 23 in ENVariables.conf + echo "Nvidia GPU detected. Setting up proper env's" 2>&1 | tee -a "$LOG" || true sed -i '/env = WLR_NO_HARDWARE_CURSORS,1/s/^#//' config/hypr/UserConfigs/ENVariables.conf sed -i '/env = LIBVA_DRIVER_NAME,nvidia/s/^#//' config/hypr/UserConfigs/ENVariables.conf sed -i '/env = __GLX_VENDOR_LIBRARY_NAME,nvidia/s/^#//' config/hypr/UserConfigs/ENVariables.conf @@ -51,58 +52,92 @@ fi # uncommenting WLR_RENDERER_ALLOW_SOFTWARE,1 if running in a VM is detected if hostnamectl | grep -q 'Chassis: vm'; then - echo "This script is running in a virtual machine." + echo "System is running in a virtual machine." 2>&1 | tee -a "$LOG" || true sed -i '/env = WLR_NO_HARDWARE_CURSORS,1/s/^#//' config/hypr/UserConfigs/ENVariables.conf sed -i '/env = WLR_RENDERER_ALLOW_SOFTWARE,1/s/^#//' config/hypr/UserConfigs/ENVariables.conf sed -i '/monitor = Virtual-1, 1920x1080@60,auto,1/s/^#//' config/hypr/UserConfigs/Monitors.conf fi +# Proper Polkit for NixOS +if hostnamectl | grep -q 'Operating System: NixOS'; then + echo "You Distro is NixOS. Setting up properly." 2>&1 | tee -a "$LOG" || true + sed -i -E '/^#?exec-once = \$scriptsDir\/Polkit-NixOS\.sh/s/^#//' config/hypr/UserConfigs/Startup_Apps.conf + sed -i '/^exec-once = \$scriptsDir\/Polkit\.sh$/ s/^#*/#/' config/hypr/UserConfigs/Startup_Apps.conf +fi + +# Check if dpkg is installed (use to check if Debian or Ubuntu or based distros +if command -v dpkg &> /dev/null; then + echo "Debian/Ubuntu based distro. Disabling pyprland" 2>&1 | tee -a "$LOG" || true + # disabling pyprland as causing issues + sed -i '/^exec-once = pypr &/ s/^/#/' config/hypr/UserConfigs/Startup_Apps.conf +fi + # Function to detect keyboard layout using localectl or setxkbmap detect_layout() { if command -v localectl >/dev/null 2>&1; then layout=$(localectl status --no-pager | awk '/X11 Layout/ {print $3}') if [ -n "$layout" ]; then echo "$layout" - else - echo "unknown" fi elif command -v setxkbmap >/dev/null 2>&1; then layout=$(setxkbmap -query | grep layout | awk '{print $2}') if [ -n "$layout" ]; then echo "$layout" - else - echo "unknown" fi - else - echo "unknown" fi } # Detect the current keyboard layout layout=$(detect_layout) -printf "${NOTE} Detecting keyboard layout to prepare necessary changes in hyprland.conf before copying\n\n" +if [ "$layout" = "(unset)" ]; then + while true; do + printf "\n%.0s" {1..1} + echo "$(tput bold)$(tput setaf 3)ATTENTION!!!! VERY IMPORTANT!!!! $(tput sgr0)" + echo "$(tput bold)$(tput setaf 1)The keyboard layout could not be detected properly. $(tput sgr0)" + echo "$(tput bold)$(tput setaf 7)You need to set it manually. $(tput sgr0)" + echo "$(tput bold)$(tput setaf 2)If you are not sure, type us. You can change later on! $(tput sgr0)" + printf "\n%.0s" {1..1} + echo "$(tput bold)$(tput setaf 5)You can also set more than 2 layouts!$(tput sgr0)" + echo "$(tput bold)$(tput setaf 5)ie: us,kr,es $(tput sgr0)" + printf "\n%.0s" {1..1} + read -p "${CAT} - Please enter the correct keyboard layout: " new_layout + + if [ -n "$new_layout" ]; then + layout="$new_layout" + break + else + echo "Please enter a keyboard layout." + fi + done +fi + +printf "${NOTE} Detecting keyboard layout to prepare proper Hyprland Settings\n\n" # Prompt the user to confirm whether the detected layout is correct while true; do - read -p "$ORANGE Detected current keyboard layout is: $layout. Is this correct? [y/n] " confirm + read -p "$ORANGE Current keyboard layout is: $layout. Is this correct? [y/n] " confirm case $confirm in [yY]) # If the detected layout is correct, update the 'kb_layout=' line in the file awk -v layout="$layout" '/kb_layout/ {$0 = " kb_layout=" layout} 1' config/hypr/UserConfigs/UserSettings.conf > temp.conf mv temp.conf config/hypr/UserConfigs/UserSettings.conf + echo "${NOTE} kb_layout $layout configured in settings. " 2>&1 | tee -a "$LOG" break ;; [nN]) printf "\n%.0s" {1..2} echo "$(tput bold)$(tput setaf 3)ATTENTION!!!! VERY IMPORTANT!!!! $(tput sgr0)" - echo "$(tput bold)$(tput setaf 7)Setting a wrong value here will result in Hyprland not starting $(tput sgr0)" - echo "$(tput bold)$(tput setaf 7)If you are not sure, keep it in us layout. You can change later on! $(tput sgr0)" - echo "$(tput bold)$(tput setaf 7)You can also set more than 2 layouts!$(tput sgr0)" - echo "$(tput bold)$(tput setaf 7)ie: us,kr,es $(tput sgr0)" - printf "\n%.0s" {1..2} + echo "$(tput bold)$(tput setaf 1)Setting a wrong value here will result in Hyprland not starting $(tput sgr0)" + echo "$(tput bold)$(tput setaf 2)If you are not sure, type us. You can change later on! $(tput sgr0)" + printf "\n%.0s" {1..1} + echo "$(tput bold)$(tput setaf 5)You can also set more than 2 layouts!$(tput sgr0)" + echo "$(tput bold)$(tput setaf 5)ie: us,kr,es $(tput sgr0)" + printf "\n%.0s" {1..1} + read -p "${CAT} - Please enter the correct keyboard layout: " new_layout + # Update the 'kb_layout=' line with the correct layout in the file awk -v new_layout="$new_layout" '/kb_layout/ {$0 = " kb_layout=" new_layout} 1' config/hypr/UserConfigs/UserSettings.conf > temp.conf mv temp.conf config/hypr/UserConfigs/UserSettings.conf @@ -115,6 +150,11 @@ done printf "\n" +# Check if asusctl is installed and add rog-control-center on Startup +if command -v asusctl >/dev/null 2>&1; then + sed -i '/exec-once = rog-control-center &/s/^#//' config/hypr/UserConfigs/Startup_Apps.conf +fi + # Ask whether to change to 12hr format while true; do echo -e "$ORANGE By default, configs are in 24H format." @@ -279,6 +319,12 @@ while true; do if git clone "https://github.com/JaKooLit/Wallpaper-Bank.git"; then echo "${NOTE} Wallpapers downloaded successfully." 2>&1 | tee -a "$LOG" + # Check if wallpapers directory exists and create it if not + if [ ! -d ~/Pictures/wallpapers ]; then + mkdir -p ~/Pictures/wallpapers + echo "${NOTE} Created wallpapers directory." 2>&1 | tee -a "$LOG" + fi + if cp -R Wallpaper-Bank/wallpapers/* ~/Pictures/wallpapers/ >> "$LOG" 2>&1; then echo "${NOTE} Wallpapers copied successfully." 2>&1 | tee -a "$LOG" rm -rf Wallpaper-Bank 2>&1 # Remove cloned repository after copying wallpapers diff --git a/wallpapers/Lofi-Urban-Nightscape.png b/wallpapers/Under_Starlit_Sky.png Binary files differindex 42dc718f..d46136eb 100644 --- a/wallpapers/Lofi-Urban-Nightscape.png +++ b/wallpapers/Under_Starlit_Sky.png |
