diff options
93 files changed, 1085 insertions, 519 deletions
diff --git a/config/ags/user/style.css b/config/ags/user/style.css index 49d44ad8..13410ea4 100644 --- a/config/ags/user/style.css +++ b/config/ags/user/style.css @@ -6,7 +6,7 @@ /* define some colors */ @define-color border-color @color12; -@define-color border-color-alt @color1; +@define-color border-color-alt @color9; @define-color text-color rgba(255, 255, 255, 0.7); @define-color noti-bg rgba(0, 0, 0, 0.4); @define-color noti-bg-alt #111111; @@ -24,11 +24,11 @@ widget { transition: 300ms cubic-bezier(0, 0.55, 0.45, 1); border-radius: 1.705rem; -gtk-outline-radius: 1.705rem; - border-top: 2px solid @border-color; + border-top: 4px solid @border-color; border-left: 1px solid @border-color-alt; border-right: 1px solid @border-color-alt; - border-bottom: 2px solid @border-color; - /*box-shadow: 0px 2px 3px alpha(@color0, 0.45); */ + border-bottom: 4px solid @border-color; + box-shadow: 0px 2px 3px alpha(@color12, 0.45); margin: 0.476rem; min-width: 13.636rem; min-height: 3.409rem; @@ -70,10 +70,10 @@ widget { .overview-search-results { border-radius: 1.705rem; -gtk-outline-radius: 1.705rem; - border-top: 2px solid @border-color; + border-top: 4px solid @border-color; border-left: 1px solid @border-color-alt; border-right: 1px solid @border-color-alt; - border-bottom: 2px solid @border-color; + border-bottom: 4px solid @border-color; box-shadow: 0px 2px 3px @color9; margin: 0.476rem; min-width: 28.773rem; @@ -123,10 +123,10 @@ widget { .overview-tasks { border-radius: 1.705rem; -gtk-outline-radius: 1.705rem; - border-top: 2px solid @border-color; + border-top: 4px solid @border-color; border-left: 1px solid @border-color-alt; border-right: 1px solid @border-color-alt; - border-bottom: 2px solid @border-color; + border-bottom: 4px solid @border-color; box-shadow: 0px 2px 3px @color5; margin: 0.476rem; padding: 0.341rem; diff --git a/config/hypr/UserConfigs/00-Readme b/config/hypr/UserConfigs/00-Readme index 481eeace..fa4b9b85 100644 --- a/config/hypr/UserConfigs/00-Readme +++ b/config/hypr/UserConfigs/00-Readme @@ -4,7 +4,7 @@ Hyprland-Dots v2.2.2 1.) Suggest not to rename any files in this folder. As this is connected and being sourced from hyprland.conf in ~/.config/hypr -2.) This folder, along with UserScripts folder will NOT be touch during update. +2.) This folder, along with UserScripts folder will NOT be touch when running upgrade.sh 3.) However, if hyprland has a big change in settings, i.e., blur section is moved into another group, you should managed the change. diff --git a/config/hypr/UserConfigs/WorkspaceRules.conf b/config/hypr/UserConfigs/WorkspaceRules.conf index 8e98244a..350022b1 100644 --- a/config/hypr/UserConfigs/WorkspaceRules.conf +++ b/config/hypr/UserConfigs/WorkspaceRules.conf @@ -5,9 +5,15 @@ # https://wiki.hyprland.org/Configuring/Workspace-Rules/ -# Assigning workspace to a certain monitor +# Assigning workspace to a certain monitor. Below are just examples # workspace = 1, monitor:eDP-1 -# workspace = 2, monitor:DP-2 +# workspace = 2, monitor:eDP-1 +# workspace = 3, monitor:eDP-1 +# workspace = 4, monitor:eDP-1 +# workspace = 5, monitor:DP-2 +# workspace = 6, monitor:DP-2 +# workspace = 7, monitor:DP-2 +# workspace = 8, monitor:DP-2 # example rules (from wiki) diff --git a/config/hypr/UserScripts/00-Readme b/config/hypr/UserScripts/00-Readme index de251df0..1b6688f4 100755 --- a/config/hypr/UserScripts/00-Readme +++ b/config/hypr/UserScripts/00-Readme @@ -1 +1,3 @@ -a) Place your new scripts here. If you need to edit a script from main script (~/.config/hypr/scripts), copy it on this folder, and edit. Make sure to update as well the keybinds in ~/.config/hypr/UserConfigs folder if any script is attached to it
\ No newline at end of file +# Place your new scripts here. +# If you need to edit a script from main script (~/.config/hypr/scripts), copy it on this folder, and edit. +# Make sure to update as well the keybinds in ~/.config/hypr/UserConfigs folder if any script is attached to it
\ No newline at end of file diff --git a/config/hypr/UserScripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh index c8168ca3..ed5a4e1c 100755 --- a/config/hypr/UserScripts/QuickEdit.sh +++ b/config/hypr/UserScripts/QuickEdit.sh @@ -1,4 +1,5 @@ #!/bin/bash +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## # Rofi menu for Quick Edit/View of Settings (SUPER E) # Define preferred text editor and terminal diff --git a/config/hypr/UserScripts/RainbowBorders.sh b/config/hypr/UserScripts/RainbowBorders.sh index 49295680..cc1419fb 100755 --- a/config/hypr/UserScripts/RainbowBorders.sh +++ b/config/hypr/UserScripts/RainbowBorders.sh @@ -1,4 +1,6 @@ #!/bin/bash +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## +# for rainbow borders animation function random_hex() { random_hex=("0xff$(openssl rand -hex 3)") diff --git a/config/hypr/UserScripts/Weather.py b/config/hypr/UserScripts/Weather.py index c0a40fd7..e3a6c538 100755 --- a/config/hypr/UserScripts/Weather.py +++ b/config/hypr/UserScripts/Weather.py @@ -1,4 +1,6 @@ #!/usr/bin/env python3 +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # +# weather using python import subprocess from pyquery import PyQuery # install using `pip install pyquery` diff --git a/config/hypr/UserScripts/Weather.sh b/config/hypr/UserScripts/Weather.sh index f916b028..65613fca 100755 --- a/config/hypr/UserScripts/Weather.sh +++ b/config/hypr/UserScripts/Weather.sh @@ -1,4 +1,7 @@ #!/bin/bash +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## +# weather info from wttr. https://github.com/chubin/wttr.in +# Remember to add city city= cachedir=~/.cache/rbn diff --git a/config/hypr/UserScripts/ZshChangeTheme.sh b/config/hypr/UserScripts/ZshChangeTheme.sh index f06f2b60..57fbf37d 100755 --- a/config/hypr/UserScripts/ZshChangeTheme.sh +++ b/config/hypr/UserScripts/ZshChangeTheme.sh @@ -3,7 +3,6 @@ # Script for Oh my ZSH theme ( CTRL SHIFT O) # preview of theme can be view here: https://github.com/ohmyzsh/ohmyzsh/wiki/Themes - # after choosing theme, TTY need to be closed and re-open themes_dir="$HOME/.oh-my-zsh/themes" diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf index 9bd89647..9c077336 100644 --- a/config/hypr/configs/Keybinds.conf +++ b/config/hypr/configs/Keybinds.conf @@ -37,7 +37,7 @@ bind = $mainMod, W, exec, $UserScripts/WallpaperSelect.sh # Select wallpaper to bind = $mainMod SHIFT, W, exec, $UserScripts/WallpaperEffects.sh # Wallpaper Effects by imagemagickWW bind = CTRL ALT, W, exec, $UserScripts/WallpaperRandom.sh # Random wallpapers bind = $mainMod ALT, O, exec, hyprctl setprop active opaque toggle #disable opacity to active window - +bind = $mainMod SHIFT, K, exec, $scriptsDir/KeyBinds.sh # searchable keybinds # Waybar / Bar related bind = $mainMod, B, exec, pkill -SIGUSR1 waybar # Toggle hide/show waybar bind = $mainMod CTRL, B, exec, $scriptsDir/WaybarStyles.sh # Waybar Styles Menu diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index 15a0b26d..57ab705d 100644 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -1,3 +1,4 @@ +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # # Sourcing external config files # Default Configs diff --git a/config/hypr/hyprlock-1080p.conf b/config/hypr/hyprlock-1080p.conf index 3527f0a2..28b94f2a 100644 --- a/config/hypr/hyprlock-1080p.conf +++ b/config/hypr/hyprlock-1080p.conf @@ -65,7 +65,7 @@ label { monitor = text = cmd[update:1000] echo "$(date +"%H")" # text = cmd[update:1000] echo "$(date +"%I")" #AM/PM - color = rgba(255, 185, 0, .6) + color = rgba(255, 185, 0, .8) font_size = 150 font_family = JetBrains Mono Nerd Font Mono ExtraBold position = 0, -200 @@ -77,7 +77,7 @@ label { label { monitor = text = cmd[update:1000] echo "$(date +"%M")" - color = rgba(255, 255, 255, .6) + color = rgba(15, 10, 222, .8) font_size = 150 font_family = JetBrains Mono Nerd Font Mono ExtraBold position = 0, -450 @@ -90,7 +90,7 @@ label { monitor = text = cmd[update:1000] echo "$(date +"%S")" # text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM - color = $color12 + color = $color7 font_size = 20 font_family = JetBrains Mono Nerd Font Mono ExtraBold position = 0, -450 diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf index e5b18cc0..39dc95f1 100644 --- a/config/hypr/hyprlock.conf +++ b/config/hypr/hyprlock.conf @@ -65,7 +65,7 @@ label { monitor = text = cmd[update:1000] echo "$(date +"%H")" # text = cmd[update:1000] echo "$(date +"%I")" #AM/PM - color = rgba(255, 185, 0, .6) + color = rgba(255, 185, 0, .8) font_size = 200 font_family = JetBrains Mono Nerd Font Mono ExtraBold position = 0, -200 @@ -77,7 +77,7 @@ label { label { monitor = text = cmd[update:1000] echo "$(date +"%M")" - color = rgba(255, 255, 255, .6) + color = rgba(15, 10, 222, .8) font_size = 200 font_family = JetBrains Mono Nerd Font Mono ExtraBold position = 0, -500 @@ -90,7 +90,7 @@ label { monitor = text = cmd[update:1000] echo "$(date +"%S")" # text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM - color = $color12 + color = $color7 font_size = 40 font_family = JetBrains Mono Nerd Font Mono ExtraBold position = 0, -500 @@ -102,7 +102,7 @@ label { label { monitor = text = $USER - color = $color12 + color = $color10 font_size = 18 font_family = Inter Display Medium diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh index e077d151..fb9cf574 100755 --- a/config/hypr/initial-boot.sh +++ b/config/hypr/initial-boot.sh @@ -1,8 +1,10 @@ #!/bin/bash +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # # A bash script designed to run only once dotfiles installed # THIS SCRIPT CAN BE DELETED ONCE SUCCESSFULLY BOOTED!! And also, edit ~/.config/hypr/configs/Settings.conf -# not necessary to do since this script is only designed to run only once as long as the marker exists +# NOT necessary to do since this script is only designed to run only once as long as the marker exists +# marker file is located at ~/.config/hypr/.initial_startup_done # However, I do highly suggest not to touch it since again, as long as the marker exist, script wont run # Variables diff --git a/config/hypr/scripts/KeyBinds.sh b/config/hypr/scripts/KeyBinds.sh new file mode 100755 index 00000000..ccbb18a8 --- /dev/null +++ b/config/hypr/scripts/KeyBinds.sh @@ -0,0 +1,30 @@ +#!/bin/bash +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## +# Searchable enabled keybinds using rofi + +# Kill yad to not interfere with this binds +pkill yad || true + + +# Define the config files +KEYBINDS_CONF="$HOME/.config/hypr/configs/Keybinds.conf" +USER_KEYBINDS_CONF="$HOME/.config/hypr/UserConfigs/UserKeybinds.conf" +LAPTOP_CONF="$HOME/.config/hypr/UserConfigs/Laptop.conf" + +# Combine the contents of the keybinds files and filter for keybinds +KEYBINDS=$(cat "$KEYBINDS_CONF" "$USER_KEYBINDS_CONF" | grep -E '^(bind|bindl|binde|bindm)') + +# Check if Laptop.conf exists and add its keybinds if present +if [[ -f "$LAPTOP_CONF" ]]; then + LAPTOP_BINDS=$(grep -E '^(bind|bindl|binde|bindm)' "$LAPTOP_CONF") + KEYBINDS+=$'\n'"$LAPTOP_BINDS" +fi + +# Check if we have any keybinds to display +if [[ -z "$KEYBINDS" ]]; then + echo "No keybinds found." + exit 1 +fi + +# Use rofi to display the keybinds +echo "$KEYBINDS" | rofi -dmenu -i -p "Keybinds" -config ~/.config/rofi/config-keybinds.rasi diff --git a/config/hypr/scripts/KeyHints.sh b/config/hypr/scripts/KeyHints.sh index 0f8a989a..e2e12634 100755 --- a/config/hypr/scripts/KeyHints.sh +++ b/config/hypr/scripts/KeyHints.sh @@ -5,6 +5,11 @@ # GDK BACKEND. Change to either wayland or x11 if having issues BACKEND=wayland +# Check if rofi is running and kill it if it is +if pgrep -x "rofi" > /dev/null; then + pkill rofi +fi + # Detect monitor resolution and scale x_mon=$(hyprctl -j monitors | jq '.[] | select(.focused==true) | .width') y_mon=$(hyprctl -j monitors | jq '.[] | select(.focused==true) | .height') @@ -43,6 +48,7 @@ GDK_BACKEND=$BACKEND yad --width=$dynamic_width --height=$dynamic_height \ "ESC" "close this app" "" "=" "SUPER KEY (Windows Key)" "(SUPER KEY)" \ " enter" "Terminal" "(kitty)" \ " SHIFT enter" "DropDown Terminal" "(kitty-pyprland)" \ +" SHIFT K" "Searchable Keybinds" "(Keybinds)" \ " A" "Desktop Overview" "(AGS Overview)" \ " D" "App Launcher" "(rofi-wayland)" \ " T" "Open File Manager" "(Thunar)" \ diff --git a/config/hypr/scripts/PortalHyprland.sh b/config/hypr/scripts/PortalHyprland.sh index d40f02ed..9bdf4b8c 100755 --- a/config/hypr/scripts/PortalHyprland.sh +++ b/config/hypr/scripts/PortalHyprland.sh @@ -1,6 +1,6 @@ #!/bin/bash # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## -# For manually starting xdg-desktop-portal +# For manually starting xdg-desktop-portal-hyprland sleep 1 killall xdg-desktop-portal-hyprland diff --git a/config/hypr/scripts/RefreshNoWaybar.sh b/config/hypr/scripts/RefreshNoWaybar.sh index 70a4aeb3..8e20766b 100755 --- a/config/hypr/scripts/RefreshNoWaybar.sh +++ b/config/hypr/scripts/RefreshNoWaybar.sh @@ -1,9 +1,9 @@ #!/bin/bash # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## -# Modified version of Refresh but no waybar refresh +# Modified version of Refresh.sh but no waybar refreshing # Used by automatic wallpaper change -# Modified inorder to refresh rofi background, Wallust, SwayNC +# Modified inorder to refresh rofi background, Wallust, SwayNC only SCRIPTSDIR=$HOME/.config/hypr/scripts UserScripts=$HOME/.config/hypr/UserScripts diff --git a/config/hypr/scripts/WaybarCava.sh b/config/hypr/scripts/WaybarCava.sh index 3c4b0f53..99261387 100755 --- a/config/hypr/scripts/WaybarCava.sh +++ b/config/hypr/scripts/WaybarCava.sh @@ -1,6 +1,5 @@ #!/bin/bash # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## - # Not my own work. This was added through Github PR. Credit to original author #----- Optimized bars animation without much CPU usage increase -------- diff --git a/config/hypr/scripts/Wlogout.sh b/config/hypr/scripts/Wlogout.sh index 531c7c66..b7cc220d 100755 --- a/config/hypr/scripts/Wlogout.sh +++ b/config/hypr/scripts/Wlogout.sh @@ -1,9 +1,9 @@ #!/bin/bash # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## - # wlogout (Power, Screen Lock, Suspend, etc) -# Set variables for parameters +# Set variables for parameters. First numbers corresponts to Monitor Resolution +# i.e 2160 means 2160p A_2160=700 B_2160=700 A_1600=480 diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index e2785941..4e57fe7f 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -1,3 +1,5 @@ +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # + font_family Fira Code SemiBold font_size 16.0 bold_font auto diff --git a/config/rofi/config-keybinds.rasi b/config/rofi/config-keybinds.rasi new file mode 100644 index 00000000..37aba113 --- /dev/null +++ b/config/rofi/config-keybinds.rasi @@ -0,0 +1,20 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ +/* Main Config - For Keybinds generation */ + +@import "~/.config/rofi/master-config.rasi" + +/* ---- Entry ---- */ +entry { + width: 80%; + placeholder: " 🧮 Search Keybinds ☣️ NOTE ☣️: Clicking with Mouse or Pressing ENTER will have NO function"; +} + +/* ---- Listview ---- */ +listview { + columns: 2; + lines: 12; +} + +window { + width: 90%; +}
\ No newline at end of file diff --git a/config/rofi/config-rofi-Beats-menu.rasi b/config/rofi/config-rofi-Beats-menu.rasi index af81e57d..896b3136 100644 --- a/config/rofi/config-rofi-Beats-menu.rasi +++ b/config/rofi/config-rofi-Beats-menu.rasi @@ -1,5 +1,5 @@ /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ -/* Rofi Beats Config (compact) */ +/* Main config Rofi Beats Config (compact) */ @import "~/.config/rofi/master-config.rasi" diff --git a/config/waybar/Modules b/config/waybar/Modules index e825e53b..647530c8 100644 --- a/config/waybar/Modules +++ b/config/waybar/Modules @@ -2,20 +2,10 @@ /* Waybar Modules */ { -/* NOTE: hyprland-workspaces on a separate file */ -// Weather and Temperature Modules as this is most like to change always. +/* NOTE: hyprland-workspaces and Custom Modules on a separate files */ +/* Weather Temperature Modules as this is most like to change always. */ // Result is of course easier to edit -"custom/weather": { - "format": "{}", - "format-alt": "{alt}: {}", - "format-alt-click": "click", - "interval": 3600, - "return-type": "json", - "exec": "$HOME/.config/hypr/UserScripts/Weather.sh", - //"exec": "$HOME/.config/hypr/UserScripts/Weather.py", - "exec-if": "ping wttr.in -c1", - "tooltip": true, -}, + "temperature": { "interval": 10, "tooltip": true, @@ -32,6 +22,7 @@ ], "on-click-right": "kitty --title nvtop sh -c 'nvtop'" }, + "temperature#vertical": { "interval": 10, "tooltip": true, @@ -49,62 +40,6 @@ "on-click-right": "kitty --title nvtop sh -c 'nvtop'" }, - -// GROUP -"group/motherboard": { - "orientation": "horizontal", - "modules": [ - "cpu", - "memory", - "temperature", - "disk", - ] -}, -"group/mobo_drawer": { - "orientation": "inherit", - "drawer": { - "transition-duration": 500, - "children-class": "cpu", - "transition-left-to-right": true - }, - "modules": [ - "temperature", - "cpu", - "memory", - "disk", - ] -}, -"group/laptop": { - "orientation": "inherit", - "modules": [ - "backlight", - "battery", - ] -}, -"group/audio": { - "orientation": "inherit", - "drawer": { - "transition-duration": 500, - "children-class": "pulseaudio", - "transition-left-to-right": true - }, - "modules": [ - "pulseaudio", - "pulseaudio#microphone", - ] -}, -"group/connections": { - "orientation": "inherit", - "drawer": { - "transition-duration": 500, - "children-class": "bluetooth", - "transition-left-to-right": true - }, - "modules": [ - "network", - "bluetooth", - ] -}, "backlight": { "interval": 2, "align": 0, @@ -165,7 +100,7 @@ "on-click-right": "$HOME/.config/hypr/scripts/Wlogout.sh", }, "bluetooth": { - "format": "", + "format": " ", "format-disabled": "", "format-connected": " {num_connections}", "tooltip-format": " {device_alias}", @@ -362,7 +297,7 @@ ] }, "power-profiles-daemon": { - "format": "{icon}", + "format": "{icon} ", "tooltip-format": "Power profile: {profile}\nDriver: {driver}", "tooltip": true, "format-icons": { @@ -457,148 +392,7 @@ "kitty-dropterm" ], }, -"custom/cycle_wall": { - "format": " ", - "on-click": "$HOME/.config/hypr/UserScripts/WallpaperSelect.sh", - "on-click-right": "$HOME/.config/hypr/UserScripts/WallpaperRandom.sh", - "on-click-middle": "$HOME/.config/hypr/scripts/WaybarStyles.sh", - "tooltip": true, - "tooltip-format": "Left Click: Wallpaper Menu\nMiddle Click: Random wallpaper\nRight Click: Waybar Styles Menu", -}, -"custom/hint": { - "format": " HINT!", - "on-click": "$HOME/.config/hypr/scripts/KeyHints.sh", - "tooltip": true, - "tooltip-format": " Quick Tips", -}, -// Hypridle inhibitor -"custom/hypridle": { - "format": " ", - "return-type": "json", - "escape": true, - "exec-on-event": true, - "interval": 60, - "exec": "$HOME/.config/hypr/scripts/Hypridle.sh status", - "on-click": "$HOME/.config/hypr/scripts/Hypridle.sh toggle", - "on-click-right": "hyprlock" - }, -"custom/keyboard": { - "exec": "cat $HOME/.cache/kb_layout", - "interval": 1, - "format": " {}", - "on-click": "$HOME/.config/hypr/scripts/SwitchKeyboardLayout.sh", -}, -"custom/light_dark": { - "format": "", - "on-click": "$HOME/.config/hypr/scripts/DarkLight.sh", - "on-click-right": "$HOME/.config/hypr/scripts/WaybarStyles.sh", - "on-click-middle": "$HOME/.config/hypr/UserScripts/WallpaperSelect.sh", - "tooltip": true, - "tooltip-format": "Left Click: Switch Dark-Light Themes\nMiddle Click: Wallpaper Menu\nRight Click: Waybar Styles Menu", -}, -"custom/lock": { - "format": "", - "on-click": "$HOME/.config/hypr/scripts/LockScreen.sh", - "tooltip": true, - "tooltip-format": " Screen Lock", -}, -"custom/menu": { - "format": "", - "on-click": "pkill rofi || rofi -show drun -modi run,drun,filebrowser,window", - "on-click-middle": "$HOME/.config/hypr/UserScripts/WallpaperSelect.sh", - "on-click-right": "$HOME/.config/hypr/scripts/WaybarLayout.sh", - "tooltip": true, - "tooltip-format": "Left Click: Rofi Menu\nMiddle Click: Wallpaper Menu\nRight Click: Waybar Layout Menu", -}, -// This is a custom cava visualizer -"custom/cava_mviz": { - "exec": "$HOME/.config/hypr/scripts/WaybarCava.sh", - "format": "{}" -}, -"custom/playerctl": { - "format": "<span>{}</span>", - "return-type": "json", - "max-length": 35, - "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} $HOME {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F", - "on-click-middle": "playerctl play-pause", - "on-click": "playerctl previous", - "on-click-right": "playerctl next", - "scroll-step": 5.0, - "on-scroll-up": "$HOME/.config/hypr/scripts/Volume.sh --inc", - "on-scroll-down": "$HOME/.config/hypr/scripts/Volume.sh --dec", - "smooth-scrolling-threshold": 1, -}, -"custom/power": { - "format": "⏻ ", - "on-click": "$HOME/.config/hypr/scripts/Wlogout.sh", - "on-click-right": "$HOME/.config/hypr/scripts/ChangeBlur.sh", - "tooltip": true, - "tooltip-format": "Left Click: Logout Menu\nRight Click: Change Blur", -}, -"custom/swaync": { - "tooltip": true, - "tooltip-format": "Left Click: Launch Notification Center\nRight Click: Do not Disturb", - "format": "{} {icon}", - "format-icons": { - "notification": "<span foreground='red'><sup></sup></span>", - "none": "", - "dnd-notification": "<span foreground='red'><sup></sup></span>", - "dnd-none": "", - "inhibited-notification": "<span foreground='red'><sup></sup></span>", - "inhibited-none": "", - "dnd-inhibited-notification": "<span foreground='red'><sup></sup></span>", - "dnd-inhibited-none": "" - }, - "return-type": "json", - "exec-if": "which swaync-client", - "exec": "swaync-client -swb", - "on-click": "sleep 0.1 && swaync-client -t -sw", - "on-click-right": "swaync-client -d -sw", - "escape": true, -}, -// NOTE:! This is only for Arch and Arch Based Distros depend: pacman-contrib -"custom/updater": { - "format": " {}", - "exec": "checkupdates | wc -l", - "exec-if": "[[ $(checkupdates | wc -l) ]]", - "interval": 15, - "on-click": "if command -v paru &> /dev/null; then kitty -T update paru -Syu; else kitty -T update yay -Syu; fi && notify-send 'The system has been updated'", - "tooltip": true, - "tooltip-format": "Left Click: Update System\nArch Linux Only", -}, - -// Separators -"custom/separator#dot": { - "format": "", - "interval": "once", - "tooltip": false -}, -"custom/separator#dot-line": { - "format": "", - "interval": "once", - "tooltip": false -}, -"custom/separator#line": { - "format": "|", - "interval": "once", - "tooltip": false -}, -"custom/separator#blank": { - "format": "", - "interval": "once", - "tooltip": false -}, -"custom/separator#blank_2": { - "format": " ", - "interval": "once", - "tooltip": false -}, -"custom/separator#blank_3": { - "format": " ", - "interval": "once", - "tooltip": false -}, // Modules below are for vertical layout "backlight#vertical": { "interval": 2, diff --git a/config/waybar/ModulesCustom b/config/waybar/ModulesCustom new file mode 100644 index 00000000..d0c8e506 --- /dev/null +++ b/config/waybar/ModulesCustom @@ -0,0 +1,198 @@ +//* ---- 💫 https://github.com/JaKooLit 💫 ---- *// +/* Waybar Modules - Custom Modules */ +/* Basically created to reduce the lines in Waybar Modules bank */ +/* NOTE: This is only for Custom Modules */ +/* Custom Modules like weather browser, tty, file manager at the beginning */ + +{ +"custom/weather": { + "format": "{}", + "format-alt": "{alt}: {}", + "format-alt-click": "click", + "interval": 3600, + "return-type": "json", + "exec": "$HOME/.config/hypr/UserScripts/Weather.sh", + //"exec": "$HOME/.config/hypr/UserScripts/Weather.py", + "exec-if": "ping wttr.in -c1", + "tooltip": true, +}, + +"custom/file_manager": { + "format": " ", + "on-click": "thunar", + "tooltip": true, + "tooltip-format": "File Manager", +}, + +"custom/tty": { + "format": " ", + "on-click": "kitty", + "tooltip": true, + "tooltip-format": "Launch Terminal", +}, + +"custom/browser": { + "format": " ", + "on-click": "firefox", + "tooltip": true, + "tooltip-format": "Launch Browser", +}, + +"custom/settings": { + "format": " ", + "on-click": "$HOME/.config/hypr/UserScripts/QuickEdit.sh", + "tooltip": true, + "tooltip-format": "Launch Quick Edit", +}, + +"custom/cycle_wall": { + "format": " ", + "on-click": "$HOME/.config/hypr/UserScripts/WallpaperSelect.sh", + "on-click-right": "$HOME/.config/hypr/UserScripts/WallpaperRandom.sh", + "on-click-middle": "$HOME/.config/hypr/scripts/WaybarStyles.sh", + "tooltip": true, + "tooltip-format": "Left Click: Wallpaper Menu\nMiddle Click: Random wallpaper\nRight Click: Waybar Styles Menu", +}, + +"custom/hint": { + "format": " HINT!", + "on-click": "$HOME/.config/hypr/scripts/KeyHints.sh", + "on-click-right": "$HOME/.config/hypr/scripts/KeyBinds.sh", + "tooltip": true, + "tooltip-format": "Left Click: Quick Tips\nRight Click: Keybinds", +}, + +// Hypridle inhibitor +"custom/hypridle": { + "format": " ", + "return-type": "json", + "escape": true, + "exec-on-event": true, + "interval": 60, + "exec": "$HOME/.config/hypr/scripts/Hypridle.sh status", + "on-click": "$HOME/.config/hypr/scripts/Hypridle.sh toggle", + "on-click-right": "hyprlock" +}, + +"custom/keyboard": { + "exec": "cat $HOME/.cache/kb_layout", + "interval": 1, + "format": " {}", + "on-click": "$HOME/.config/hypr/scripts/SwitchKeyboardLayout.sh", +}, + +"custom/light_dark": { + "format": " ", + "on-click": "$HOME/.config/hypr/scripts/DarkLight.sh", + "on-click-right": "$HOME/.config/hypr/scripts/WaybarStyles.sh", + "on-click-middle": "$HOME/.config/hypr/UserScripts/WallpaperSelect.sh", + "tooltip": true, + "tooltip-format": "Left Click: Switch Dark-Light Themes\nMiddle Click: Wallpaper Menu\nRight Click: Waybar Styles Menu", +}, + +"custom/lock": { + "format": "", + "on-click": "$HOME/.config/hypr/scripts/LockScreen.sh", + "tooltip": true, + "tooltip-format": " Screen Lock", +}, + +"custom/menu": { + "format": "", + "on-click": "pkill rofi || rofi -show drun -modi run,drun,filebrowser,window", + "on-click-middle": "$HOME/.config/hypr/UserScripts/WallpaperSelect.sh", + "on-click-right": "$HOME/.config/hypr/scripts/WaybarLayout.sh", + "tooltip": true, + "tooltip-format": "Left Click: Rofi Menu\nMiddle Click: Wallpaper Menu\nRight Click: Waybar Layout Menu", +}, +// This is a custom cava visualizer +"custom/cava_mviz": { + "exec": "$HOME/.config/hypr/scripts/WaybarCava.sh", + "format": "{}" +}, + +"custom/playerctl": { + "format": "<span>{}</span>", + "return-type": "json", + "max-length": 35, + "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} $HOME {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F", + "on-click-middle": "playerctl play-pause", + "on-click": "playerctl previous", + "on-click-right": "playerctl next", + "scroll-step": 5.0, + "on-scroll-up": "$HOME/.config/hypr/scripts/Volume.sh --inc", + "on-scroll-down": "$HOME/.config/hypr/scripts/Volume.sh --dec", + "smooth-scrolling-threshold": 1, +}, + +"custom/power": { + "format": "⏻ ", + "on-click": "$HOME/.config/hypr/scripts/Wlogout.sh", + "on-click-right": "$HOME/.config/hypr/scripts/ChangeBlur.sh", + "tooltip": true, + "tooltip-format": "Left Click: Logout Menu\nRight Click: Change Blur", +}, + +"custom/swaync": { + "tooltip": true, + "tooltip-format": "Left Click: Launch Notification Center\nRight Click: Do not Disturb", + "format": "{} {icon}", + "format-icons": { + "notification": "<span foreground='red'><sup></sup></span>", + "none": "", + "dnd-notification": "<span foreground='red'><sup></sup></span>", + "dnd-none": "", + "inhibited-notification": "<span foreground='red'><sup></sup></span>", + "inhibited-none": "", + "dnd-inhibited-notification": "<span foreground='red'><sup></sup></span>", + "dnd-inhibited-none": "" + }, + "return-type": "json", + "exec-if": "which swaync-client", + "exec": "swaync-client -swb", + "on-click": "sleep 0.1 && swaync-client -t -sw", + "on-click-right": "swaync-client -d -sw", + "escape": true, +}, +// NOTE:! This is only for Arch and Arch Based Distros depend: pacman-contrib +"custom/updater": { + "format": " {}", + "exec": "checkupdates | wc -l", + "exec-if": "[[ $(checkupdates | wc -l) ]]", + "interval": 15, + "on-click": "if command -v paru &> /dev/null; then kitty -T update paru -Syu; else kitty -T update yay -Syu; fi && notify-send 'The system has been updated'", + "tooltip": true, + "tooltip-format": "Left Click: Update System\nArch Linux Only", +}, +// Separators +"custom/separator#dot": { + "format": "", + "interval": "once", + "tooltip": false +}, +"custom/separator#dot-line": { + "format": "", + "interval": "once", + "tooltip": false +}, +"custom/separator#line": { + "format": "|", + "interval": "once", + "tooltip": false +}, +"custom/separator#blank": { + "format": "", + "interval": "once", + "tooltip": false +}, +"custom/separator#blank_2": { + "format": " ", + "interval": "once", + "tooltip": false +}, +"custom/separator#blank_3": { + "format": " ", + "interval": "once", + "tooltip": false +}, +}
\ No newline at end of file diff --git a/config/waybar/ModulesGroups b/config/waybar/ModulesGroups new file mode 100644 index 00000000..6e18ca52 --- /dev/null +++ b/config/waybar/ModulesGroups @@ -0,0 +1,96 @@ +//* ---- 💫 https://github.com/JaKooLit 💫 ---- *// +/* Waybar Modules - Groups Modules */ +/* Basically created to reduce the lines in Waybar Modules bank */ +/* NOTE: This is only for Groups */ + +{ +// GROUPS +"group/app_drawer": { + "orientation": "inherit", + "drawer": { + "transition-duration": 500, + "children-class": "custom/menu", + "transition-left-to-right": true + }, + "modules": [ + "custom/menu", + "custom/light_dark", + "custom/file_manager", + "custom/tty", + "custom/browser", + "custom/settings", + "power-profiles-daemon", + ] +}, +"group/motherboard": { + "orientation": "horizontal", + "modules": [ + "cpu", + "memory", + "temperature", + "disk", + ] +}, + +"group/mobo_drawer": { + "orientation": "inherit", + "drawer": { + "transition-duration": 500, + "children-class": "cpu", + "transition-left-to-right": true + }, + "modules": [ + "temperature", + "cpu", + "memory", + "disk", + ] +}, +"group/laptop": { + "orientation": "inherit", + "modules": [ + "backlight", + "battery", + ] +}, +"group/audio": { + "orientation": "inherit", + "drawer": { + "transition-duration": 500, + "children-class": "pulseaudio", + "transition-left-to-right": true + }, + "modules": [ + "pulseaudio", + "pulseaudio#microphone", + ] +}, + +"group/connections": { + "orientation": "inherit", + "drawer": { + "transition-duration": 500, + "children-class": "bluetooth", + "transition-left-to-right": true + }, + "modules": [ + "network", + "bluetooth", + ] +}, + +"group/status": { + "orientation": "inherit", + "drawer": { + "transition-duration": 500, + "children-class": "custom/power", + "transition-left-to-right": false + }, + "modules": [ + "custom/power", + "custom/lock", + "keyboard-state", + "custom/keyboard", + ] +}, +}
\ No newline at end of file diff --git a/config/waybar/ModulesWorkspaces b/config/waybar/ModulesWorkspaces index 750c3488..4d840c0d 100644 --- a/config/waybar/ModulesWorkspaces +++ b/config/waybar/ModulesWorkspaces @@ -2,185 +2,185 @@ /* Waybar Workspaces modules */ /* Generally, this is a potential expanding of choices for hyprland/workspace */ -{ +// HYPRLAND WORKSPACES. CHOOSE as desired and place on waybar configs - // HYPRLAND WORKSPACES. CHOOSE as desired and place on waybar configs - // CIRCLES Style - "hyprland/workspaces": { - "active-only": false, - "all-outputs": true, - "format": "{icon}", - "show-special": false, - "on-click": "activate", - "on-scroll-up": "hyprctl dispatch workspace e+1", - "on-scroll-down": "hyprctl dispatch workspace e-1", - "persistent-workspaces": { - "*": 5 - }, - "format-icons": { - "active": "", - "default": "", - }, +{ +// CIRCLES Style +"hyprland/workspaces": { + "active-only": false, + "all-outputs": true, + "format": "{icon}", + "show-special": false, + "on-click": "activate", + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1", + "persistent-workspaces": { + "*": 5 }, - // ROMAN Numerals style - "hyprland/workspaces#roman": { - "active-only": false, - "all-outputs": true, - "format": "{icon}", - "show-special": false, - "on-click": "activate", - "on-scroll-up": "hyprctl dispatch workspace e+1", - "on-scroll-down": "hyprctl dispatch workspace e-1", - "persistent-workspaces": { - "*": 5 - }, - "format-icons": { - "1": "I", - "2": "II", - "3": "III", - "4": "IV", - "5": "V", - "6": "VI", - "7": "VII", - "8": "VIII", - "9": "IX", - "10": "X", - }, + "format-icons": { + "active": "", + "default": "", }, - // PACMAN Style - "hyprland/workspaces#pacman": { - "active-only": false, - "all-outputs": true, - "format": "{icon}", - "on-click": "activate", - "on-scroll-up": "hyprctl dispatch workspace e+1", - "on-scroll-down": "hyprctl dispatch workspace e-1", - "show-special": false, - "persistent-workspaces": { - "*": 5 - }, - "format": "{icon}", - "format-icons": { - "active": "<span font='12'></span>", - "empty": "<span font='8'></span>", - "default": "", - }, +}, +// ROMAN Numerals style +"hyprland/workspaces#roman": { + "active-only": false, + "all-outputs": true, + "format": "{icon}", + "show-special": false, + "on-click": "activate", + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1", + "persistent-workspaces": { + "*": 5 }, - // Kanji / Japanese style - "hyprland/workspaces#kanji": { - "disable-scroll": true, - "show-special": false, - "all-outputs": true, - "format": "{icon}", - "persistent-workspaces": { - "*": 5 - }, - "format-icons": { - "1": "一", - "2": "二", - "3": "三", - "4": "四", - "5": "五", - "6": "六", - "7": "七", - "8": "八", - "9": "九", - "10": "十", - } + "format-icons": { + "1": "I", + "2": "II", + "3": "III", + "4": "IV", + "5": "V", + "6": "VI", + "7": "VII", + "8": "VIII", + "9": "IX", + "10": "X", + }, +}, +// PACMAN Style +"hyprland/workspaces#pacman": { + "active-only": false, + "all-outputs": true, + "format": "{icon}", + "on-click": "activate", + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1", + "show-special": false, + "persistent-workspaces": { + "*": 5 + }, + "format": "{icon}", + "format-icons": { + "active": "<span font='12'></span>", + "empty": "<span font='8'></span>", + "default": "", + }, +}, +// Kanji / Japanese style +"hyprland/workspaces#kanji": { + "disable-scroll": true, + "show-special": false, + "all-outputs": true, + "format": "{icon}", + "persistent-workspaces": { + "*": 5 + }, + "format-icons": { + "1": "一", + "2": "二", + "3": "三", + "4": "四", + "5": "五", + "6": "六", + "7": "七", + "8": "八", + "9": "九", + "10": "十", + } +}, +// for Camilla or Spanish +"hyprland/workspaces#cam": { + "active-only":false, + "all-outputs": true, + "format": "{icon}", + "show-special": false, + "on-click": "activate", + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1", + "persistent-workspaces": { + "*": 5 }, - // for Camilla or Spanish - "hyprland/workspaces#cam": { - "active-only":false, - "all-outputs": true, - "format": "{icon}", - "show-special": false, - "on-click": "activate", - "on-scroll-up": "hyprctl dispatch workspace e+1", - "on-scroll-down": "hyprctl dispatch workspace e-1", - "persistent-workspaces": { - "*": 5 - }, - "format-icons": { - "1": "Uno", - "2": "Due", - "3": "Tre", - "4": "Quattro", - "5": "Cinque", - "6":"Sei", - "7":"Sette", - "8":"Otto", - "9":"Nove", - "10":"Dieci" - } - }, - - // NUMBERS and ICONS style - "hyprland/workspaces#4": { - "format": "{name}", - "format": " {name} {icon} ", - //"format": " {icon} ", - "show-special": false, - "on-click": "activate", - "on-scroll-up": "hyprctl dispatch workspace e+1", - "on-scroll-down": "hyprctl dispatch workspace e-1", - "all-outputs": true, - "sort-by-number": true, "format-icons": { - "1": " ", - "2": " ", - "3": " ", - "4": " ", - "5": " ", - "6": " ", - "7": "", - "8": " ", - "9": "", - "10": "10", - "focused": "", - "default": "", - }, + "1": "Uno", + "2": "Due", + "3": "Tre", + "4": "Quattro", + "5": "Cinque", + "6":"Sei", + "7":"Sette", + "8":"Otto", + "9":"Nove", + "10":"Dieci" + } + }, + +// NUMBERS and ICONS style +"hyprland/workspaces#4": { + "format": "{name}", + "format": " {name} {icon} ", + //"format": " {icon} ", + "show-special": false, + "on-click": "activate", + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1", + "all-outputs": true, + "sort-by-number": true, + "format-icons": { + "1": " ", + "2": " ", + "3": " ", + "4": " ", + "5": " ", + "6": " ", + "7": "", + "8": " ", + "9": "", + "10": "10", + "focused": "", + "default": "", + }, +}, +// NUMBERS and ICONS style with window rewrite +"hyprland/workspaces#rw": { + "disable-scroll": true, + "all-outputs": true, + "warp-on-scroll": false, + "sort-by-number": true, + "show-special": false, + "on-click": "activate", + "on-scroll-up": "hyprctl dispatch workspace e+1", + "on-scroll-down": "hyprctl dispatch workspace e-1", + "format": "{icon} {windows}", + "format-window-separator": " ", + "window-rewrite-default": " ", + "window-rewrite": { + "title<.*youtube.*>": " ", + "title<.*amazon.*>": " ", + "title<.*reddit.*>": " ", + "title<.*Picture-in-Picture.*>": " ", + "class<firefox|org.mozilla.firefox>": " ", + "class<kitty|konsole>": " ", + "class<kitty-dropterm>": " ", + "class<Chromium>": " ", + "class<org.telegram.desktop|io.github.tdesktop_x64.TDesktop>": " ", + "class<[Ss]potify>": " ", + "class<VSCode|code-url-handler|code-oss|codium|codium-url-handler|VSCodium>": " ", + "class<thunar>": " ", + "class<[Tt]hunderbird|[Tt]hunderbird-esr>": " ", + "class<discord|[Ww]ebcord>": " ", + "class<subl>": " ", + "class<mpv>": " ", + "class<celluloid>": " ", + "class<Cider>": " ", + "class<virt-manager>": " ", + "class<codeblocks>": " ", + "class<mousepad>": " ", + "class<libreoffice-writer>": " ", + "class<libreoffice-startcenter>": " ", + "class<com.obsproject.Studio>": " ", + "class<polkit-gnome-authentication-agent-1>": " ", + "class<nwg-look>": " " + } }, - // NUMBERS and ICONS style with window rewrite - "hyprland/workspaces#rw": { - "disable-scroll": true, - "all-outputs": true, - "warp-on-scroll": false, - "sort-by-number": true, - "show-special": false, - "on-click": "activate", - "on-scroll-up": "hyprctl dispatch workspace e+1", - "on-scroll-down": "hyprctl dispatch workspace e-1", - "format": "{icon} {windows}", - "format-window-separator": " ", - "window-rewrite-default": " ", - "window-rewrite": { - "title<.*youtube.*>": " ", - "title<.*amazon.*>": " ", - "title<.*reddit.*>": " ", - "title<.*Picture-in-Picture.*>": " ", - "class<[Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr>": " ", - "class<kitty|konsole>": " ", - "class<kitty-dropterm>": " ", - "class<Chromium>": " ", - "class<org.telegram.desktop|io.github.tdesktop_x64.TDeskto>": " ", - "class<[Ss]potify>": " ", - "class<VSCode|code-url-handler|code-oss|codium|codium-url-handler|VSCodium>": " ", - "class<[Tt]hunar>": " ", - "class<[Tt]hunderbird|[Tt]hunderbird-esr>": " ", - "class<discord|[Ww]ebcord>": " ", - "class<subl>": " ", - "class<mpv>": " ", - "class<celluloid>": " ", - "class<Cider>": " ", - "class<virt-manager>": " ", - "class<codeblocks>": " ", - "class<mousepad>": " ", - "class<libreoffice-writer>": " ", - "class<libreoffice-startcenter>": " ", - "class<com.obsproject.Studio>": " ", - "class<polkit-gnome-authentication-agent-1>": " ", - "class<nwg-look>": " " - } - }, - - }
\ No newline at end of file + +}
\ No newline at end of file diff --git a/config/waybar/configs/[BOT & Left] SouthWest b/config/waybar/configs/[BOT & Left] SouthWest index 87be19f0..a38db32c 100644 --- a/config/waybar/configs/[BOT & Left] SouthWest +++ b/config/waybar/configs/[BOT & Left] SouthWest @@ -6,6 +6,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", @@ -50,6 +52,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", "position": "left", diff --git a/config/waybar/configs/[BOT & Right] SouthEast b/config/waybar/configs/[BOT & Right] SouthEast index db367b9c..27cc7ceb 100644 --- a/config/waybar/configs/[BOT & Right] SouthEast +++ b/config/waybar/configs/[BOT & Right] SouthEast @@ -6,6 +6,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", @@ -50,6 +52,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", "position": "right", diff --git a/config/waybar/configs/[BOT] Camellia b/config/waybar/configs/[BOT] Camellia index 4fabb931..67e8c193 100644 --- a/config/waybar/configs/[BOT] Camellia +++ b/config/waybar/configs/[BOT] Camellia @@ -9,6 +9,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", diff --git a/config/waybar/configs/[BOT] Chrysanthemum b/config/waybar/configs/[BOT] Chrysanthemum index f3368015..2aa45feb 100644 --- a/config/waybar/configs/[BOT] Chrysanthemum +++ b/config/waybar/configs/[BOT] Chrysanthemum @@ -8,6 +8,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", diff --git a/config/waybar/configs/[BOT] Default b/config/waybar/configs/[BOT] Default index d2638258..fc87a9e4 100644 --- a/config/waybar/configs/[BOT] Default +++ b/config/waybar/configs/[BOT] Default @@ -5,6 +5,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", diff --git a/config/waybar/configs/[BOT] Default Laptop b/config/waybar/configs/[BOT] Default Laptop index 11e12da8..067dfbc4 100644 --- a/config/waybar/configs/[BOT] Default Laptop +++ b/config/waybar/configs/[BOT] Default Laptop @@ -5,6 +5,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", diff --git a/config/waybar/configs/[BOT] Gardenia b/config/waybar/configs/[BOT] Gardenia index 9025edfc..fa9cbab0 100644 --- a/config/waybar/configs/[BOT] Gardenia +++ b/config/waybar/configs/[BOT] Gardenia @@ -9,6 +9,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", diff --git a/config/waybar/configs/[BOT] Peony b/config/waybar/configs/[BOT] Peony index 306ff4f9..a7f13bdd 100644 --- a/config/waybar/configs/[BOT] Peony +++ b/config/waybar/configs/[BOT] Peony @@ -9,6 +9,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", diff --git a/config/waybar/configs/[BOT] Simple b/config/waybar/configs/[BOT] Simple index ef5c30eb..46003460 100644 --- a/config/waybar/configs/[BOT] Simple +++ b/config/waybar/configs/[BOT] Simple @@ -5,6 +5,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", "position": "bottom", diff --git a/config/waybar/configs/[BOT] Sleek b/config/waybar/configs/[BOT] Sleek index c79fd71f..a4aed328 100644 --- a/config/waybar/configs/[BOT] Sleek +++ b/config/waybar/configs/[BOT] Sleek @@ -6,6 +6,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", "position": "bottom", diff --git a/config/waybar/configs/[Left] WestWing b/config/waybar/configs/[Left] WestWing index f44b97b2..4fec3cd2 100644 --- a/config/waybar/configs/[Left] WestWing +++ b/config/waybar/configs/[Left] WestWing @@ -6,6 +6,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", "position": "left", diff --git a/config/waybar/configs/[Right] EastWing b/config/waybar/configs/[Right] EastWing index c9860298..2a3acebb 100644 --- a/config/waybar/configs/[Right] EastWing +++ b/config/waybar/configs/[Right] EastWing @@ -6,6 +6,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", "position": "right", diff --git a/config/waybar/configs/[TOP & BOT] SummitSplit b/config/waybar/configs/[TOP & BOT] SummitSplit index 3d419c22..023ac1b8 100644 --- a/config/waybar/configs/[TOP & BOT] SummitSplit +++ b/config/waybar/configs/[TOP & BOT] SummitSplit @@ -6,6 +6,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", @@ -48,6 +50,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", diff --git a/config/waybar/configs/[TOP & Left] NorthWest b/config/waybar/configs/[TOP & Left] NorthWest index dd03fd92..c6ebf4a7 100644 --- a/config/waybar/configs/[TOP & Left] NorthWest +++ b/config/waybar/configs/[TOP & Left] NorthWest @@ -6,6 +6,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", @@ -47,6 +49,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", "position": "left", diff --git a/config/waybar/configs/[TOP & Right] NorthEast b/config/waybar/configs/[TOP & Right] NorthEast index 442c7886..ae588fb4 100644 --- a/config/waybar/configs/[TOP & Right] NorthEast +++ b/config/waybar/configs/[TOP & Right] NorthEast @@ -6,6 +6,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", @@ -47,6 +49,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", "position": "right", diff --git a/config/waybar/configs/[TOP] Camellia b/config/waybar/configs/[TOP] Camellia index 6cd1ee96..e13256c9 100644 --- a/config/waybar/configs/[TOP] Camellia +++ b/config/waybar/configs/[TOP] Camellia @@ -9,6 +9,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", diff --git a/config/waybar/configs/[TOP] Chrysanthemum b/config/waybar/configs/[TOP] Chrysanthemum index a37ce210..06a7bbcf 100644 --- a/config/waybar/configs/[TOP] Chrysanthemum +++ b/config/waybar/configs/[TOP] Chrysanthemum @@ -8,6 +8,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", diff --git a/config/waybar/configs/[TOP] Default b/config/waybar/configs/[TOP] Default index 747fd9fe..3a95929b 100644 --- a/config/waybar/configs/[TOP] Default +++ b/config/waybar/configs/[TOP] Default @@ -5,6 +5,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", diff --git a/config/waybar/configs/[TOP] Default Laptop b/config/waybar/configs/[TOP] Default Laptop index 02dd6169..47f13956 100644 --- a/config/waybar/configs/[TOP] Default Laptop +++ b/config/waybar/configs/[TOP] Default Laptop @@ -5,6 +5,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", diff --git a/config/waybar/configs/[TOP] Default Laptop_v2 b/config/waybar/configs/[TOP] Default Laptop_v2 index 24d1a58b..adc49a4d 100644 --- a/config/waybar/configs/[TOP] Default Laptop_v2 +++ b/config/waybar/configs/[TOP] Default Laptop_v2 @@ -5,6 +5,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", diff --git a/config/waybar/configs/[TOP] Default Laptop_v3 b/config/waybar/configs/[TOP] Default Laptop_v3 index 80f4539b..04f037fa 100644 --- a/config/waybar/configs/[TOP] Default Laptop_v3 +++ b/config/waybar/configs/[TOP] Default Laptop_v3 @@ -5,6 +5,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", diff --git a/config/waybar/configs/[TOP] Default Laptop_v4 b/config/waybar/configs/[TOP] Default Laptop_v4 new file mode 100644 index 00000000..86e5a5fe --- /dev/null +++ b/config/waybar/configs/[TOP] Default Laptop_v4 @@ -0,0 +1,55 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### DEFAULT v4 (Laptop) - Top ### // +{ +"include": [ + "$HOME/.config/waybar/Modules", + "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", + ], +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "top", +"spacing": 3, +"fixed-center": true, +"ipc": true, +"margin-top": 3, +"margin-left": 8, +"margin-right": 8, + +"modules-left": [ + "group/app_drawer", + "custom/separator#dot-line", + "group/mobo_drawer", + "custom/separator#blank", + "group/laptop", + "custom/separator#line", + "custom/weather", + ], + +"modules-center": [ + "custom/swaync", + "custom/cava_mviz", + "custom/separator#dot-line", + "clock", + "custom/separator#line", + "hyprland/workspaces#kanji", + "custom/separator#dot-line", + "idle_inhibitor", + "custom/hint", + ], + +"modules-right": [ + "network#speed", + "group/connections", + "custom/separator#line", + "tray", + "mpris", + "group/audio", + "custom/separator#dot-line", + "group/status", + ], +}
\ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default_v2 b/config/waybar/configs/[TOP] Default_v2 index 8a0b7a29..c4e4f59c 100644 --- a/config/waybar/configs/[TOP] Default_v2 +++ b/config/waybar/configs/[TOP] Default_v2 @@ -5,6 +5,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", diff --git a/config/waybar/configs/[TOP] Default_v3 b/config/waybar/configs/[TOP] Default_v3 index de393ee0..826b7724 100644 --- a/config/waybar/configs/[TOP] Default_v3 +++ b/config/waybar/configs/[TOP] Default_v3 @@ -5,6 +5,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", diff --git a/config/waybar/configs/[TOP] Default_v4 b/config/waybar/configs/[TOP] Default_v4 new file mode 100644 index 00000000..051aa848 --- /dev/null +++ b/config/waybar/configs/[TOP] Default_v4 @@ -0,0 +1,53 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### DEFAULT v4 (Laptop) - Top ### // +{ +"include": [ + "$HOME/.config/waybar/Modules", + "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", + ], +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "top", +"spacing": 3, +"fixed-center": true, +"ipc": true, +"margin-top": 3, +"margin-left": 8, +"margin-right": 8, + +"modules-left": [ + "group/app_drawer", + "custom/separator#dot-line", + "group/mobo_drawer", + "custom/separator#line", + "custom/weather", + ], + +"modules-center": [ + "custom/swaync", + "custom/cava_mviz", + "custom/separator#dot-line", + "clock", + "custom/separator#line", + "hyprland/workspaces#kanji", + "custom/separator#dot-line", + "idle_inhibitor", + "custom/hint", + ], + +"modules-right": [ + "network#speed", + "group/connections", + "custom/separator#line", + "tray", + "mpris", + "group/audio", + "custom/separator#dot-line", + "group/status", + ], +}
\ No newline at end of file diff --git a/config/waybar/configs/[TOP] Everforest b/config/waybar/configs/[TOP] Everforest index 67cf09c4..0db338a0 100644 --- a/config/waybar/configs/[TOP] Everforest +++ b/config/waybar/configs/[TOP] Everforest @@ -6,6 +6,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", diff --git a/config/waybar/configs/[TOP] Gardenia b/config/waybar/configs/[TOP] Gardenia index b8aa3b70..36b6fa1b 100644 --- a/config/waybar/configs/[TOP] Gardenia +++ b/config/waybar/configs/[TOP] Gardenia @@ -9,6 +9,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", diff --git a/config/waybar/configs/[TOP] Minimal - Long b/config/waybar/configs/[TOP] Minimal - Long index e5ff1e28..6347a498 100644 --- a/config/waybar/configs/[TOP] Minimal - Long +++ b/config/waybar/configs/[TOP] Minimal - Long @@ -6,6 +6,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", diff --git a/config/waybar/configs/[TOP] Minimal - Short b/config/waybar/configs/[TOP] Minimal - Short index e080fbd5..a0eeba39 100644 --- a/config/waybar/configs/[TOP] Minimal - Short +++ b/config/waybar/configs/[TOP] Minimal - Short @@ -6,6 +6,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", "position": "top", diff --git a/config/waybar/configs/[TOP] Peony b/config/waybar/configs/[TOP] Peony index 2ceb6473..f9f63acd 100644 --- a/config/waybar/configs/[TOP] Peony +++ b/config/waybar/configs/[TOP] Peony @@ -9,6 +9,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", //"mode": "dock", diff --git a/config/waybar/configs/[TOP] Simple b/config/waybar/configs/[TOP] Simple index 77ddefa0..e00c32ea 100644 --- a/config/waybar/configs/[TOP] Simple +++ b/config/waybar/configs/[TOP] Simple @@ -5,6 +5,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", "position": "top", diff --git a/config/waybar/configs/[TOP] Sleek b/config/waybar/configs/[TOP] Sleek index 12227bf5..5edc1646 100644 --- a/config/waybar/configs/[TOP] Sleek +++ b/config/waybar/configs/[TOP] Sleek @@ -5,6 +5,8 @@ "include": [ "$HOME/.config/waybar/Modules", "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", ], "layer": "top", "position": "top", diff --git a/config/waybar/style/[Black & White] Monochrome.css b/config/waybar/style/[Black & White] Monochrome.css index ea82bcad..c3f5e882 100644 --- a/config/waybar/style/[Black & White] Monochrome.css +++ b/config/waybar/style/[Black & White] Monochrome.css @@ -127,16 +127,23 @@ tooltip label{ #wireplumber, #workspaces, #custom-backlight, +#custom-browser, +#custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Catppuccin] Latte.css b/config/waybar/style/[Catppuccin] Latte.css index 5b2ed50d..f7a3e856 100644 --- a/config/waybar/style/[Catppuccin] Latte.css +++ b/config/waybar/style/[Catppuccin] Latte.css @@ -98,16 +98,23 @@ window#waybar.empty #window { #wireplumber, #workspaces, #custom-backlight, +#custom-browser, +#custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, -#custom-power, -#custom-speaker, #custom-power_vertical, +#custom-power, +#custom-settings, +#custom-spotify, +#custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Catppuccin] Mocha.css b/config/waybar/style/[Catppuccin] Mocha.css index 3e4ef6f7..658f73f0 100644 --- a/config/waybar/style/[Catppuccin] Mocha.css +++ b/config/waybar/style/[Catppuccin] Mocha.css @@ -118,16 +118,23 @@ window#waybar.empty #window { #wireplumber, #workspaces, #custom-backlight, +#custom-browser, +#custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Colored] Chroma Glow.css b/config/waybar/style/[Colored] Chroma Glow.css index 084f3b60..633bb78c 100644 --- a/config/waybar/style/[Colored] Chroma Glow.css +++ b/config/waybar/style/[Colored] Chroma Glow.css @@ -114,16 +114,23 @@ tooltip label{ #wireplumber, #workspaces, #custom-backlight, +#custom-browser, +#custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Colored] Translucent.css b/config/waybar/style/[Colored] Translucent.css index 8fc34966..f465ef33 100644 --- a/config/waybar/style/[Colored] Translucent.css +++ b/config/waybar/style/[Colored] Translucent.css @@ -123,16 +123,23 @@ tooltip { #wireplumber, #workspaces, #custom-backlight, +#custom-browser, +#custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Colorful] Aurora Blossom.css b/config/waybar/style/[Colorful] Aurora Blossom.css index 7945138a..1fe53ebe 100644 --- a/config/waybar/style/[Colorful] Aurora Blossom.css +++ b/config/waybar/style/[Colorful] Aurora Blossom.css @@ -116,16 +116,23 @@ tooltip label{ #wireplumber, #workspaces, #custom-backlight, +#custom-browser, +#custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Colorful] Aurora.css b/config/waybar/style/[Colorful] Aurora.css index faf38b1a..e4776dc5 100644 --- a/config/waybar/style/[Colorful] Aurora.css +++ b/config/waybar/style/[Colorful] Aurora.css @@ -104,17 +104,23 @@ tooltip label{ #wireplumber, #workspaces, #custom-backlight, +#custom-browser, #custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, -#custom-power, #custom-power_vertical, +#custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, @@ -127,11 +133,11 @@ tooltip label{ #custom-weather.showyIcyDay, #custom-weather.snowyIcyNight, #custom-weather.sunnyDay { - background-image: linear-gradient(45deg, #14e81e 10%, #017ed5 54%, #8d00c4 90%); + background-image: linear-gradient(45deg, #95E6CB, #59C2FF, #D2A6FF); color: black; border: 1px; border-style: solid; - border-radius: 4px; + border-radius: 6px; padding-top: 4px; padding-bottom: 4px; padding-right: 6px; diff --git a/config/waybar/style/[Colorful] Rainbow Spectrum.css b/config/waybar/style/[Colorful] Rainbow Spectrum.css index b1bed19f..dfe5694c 100644 --- a/config/waybar/style/[Colorful] Rainbow Spectrum.css +++ b/config/waybar/style/[Colorful] Rainbow Spectrum.css @@ -98,16 +98,23 @@ tooltip label{ #wireplumber, #workspaces, #custom-backlight, +#custom-browser, +#custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, @@ -205,6 +212,15 @@ tooltip label{ background-color: #e6ed7b; } +#custom-cava_mviz, +#power-profiles-daemon, +#custom-browser, +#custom-file_manager, +#custom-tty, +#custom-settings { + background: linear-gradient(45deg, #14e81e 10%, #017ed5 54%, #8d00c4 90%); +} + #custom-cycle_wall { background-color: #94e2d5; } diff --git a/config/waybar/style/[Dark] Golden Noir.css b/config/waybar/style/[Dark] Golden Noir.css index b3b4d515..ce380d2b 100644 --- a/config/waybar/style/[Dark] Golden Noir.css +++ b/config/waybar/style/[Dark] Golden Noir.css @@ -132,17 +132,23 @@ tooltip { #wireplumber, #workspaces, #custom-backlight, +#custom-browser, #custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Dark] Half-Moon.css b/config/waybar/style/[Dark] Half-Moon.css index e06b1ac3..df12c8d0 100644 --- a/config/waybar/style/[Dark] Half-Moon.css +++ b/config/waybar/style/[Dark] Half-Moon.css @@ -233,6 +233,17 @@ color: #F3F4F5; padding: 2px 15px; } +#custom-browser, +#custom-file_manager, +#custom-tty, +#custom-settings { + border-radius: 50px 50px; + margin: 5px; + padding: 2px 15px; + color: #0F1419; + background: linear-gradient(45deg, #95E6CB, #59C2FF, #D2A6FF); +} + #custom-weather { color: #59C2FF; background: #0F1419; diff --git a/config/waybar/style/[Dark] Latte-Wallust combined.css b/config/waybar/style/[Dark] Latte-Wallust combined.css index 775fcb51..f80b494a 100644 --- a/config/waybar/style/[Dark] Latte-Wallust combined.css +++ b/config/waybar/style/[Dark] Latte-Wallust combined.css @@ -163,8 +163,10 @@ tooltip { #wireplumber, #workspaces, #custom-backlight, +#custom-browser, #custom-cava_mviz, #custom-cycle_wall, +#custom-file_manager, #custom-keybinds, #custom-keyboard, #custom-light_dark, @@ -174,7 +176,10 @@ tooltip { #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Dark] Purpl.css b/config/waybar/style/[Dark] Purpl.css index f018a5d8..d623b8e0 100644 --- a/config/waybar/style/[Dark] Purpl.css +++ b/config/waybar/style/[Dark] Purpl.css @@ -130,17 +130,23 @@ tooltip { #wireplumber, #workspaces, #custom-backlight, +#custom-browser, #custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Dark] Wallust Obsidian Edge.css b/config/waybar/style/[Dark] Wallust Obsidian Edge.css index 5af9a161..d44f9e39 100644 --- a/config/waybar/style/[Dark] Wallust Obsidian Edge.css +++ b/config/waybar/style/[Dark] Wallust Obsidian Edge.css @@ -134,17 +134,23 @@ tooltip label { #wireplumber, #workspaces, #custom-backlight, +#custom-browser, #custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Extra] Crimson.css b/config/waybar/style/[Extra] Crimson.css index fe8a2fab..c588acc5 100644 --- a/config/waybar/style/[Extra] Crimson.css +++ b/config/waybar/style/[Extra] Crimson.css @@ -127,16 +127,23 @@ tooltip { #wireplumber, #workspaces, #custom-backlight, +#custom-browser, +#custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Extra] EverForest.css b/config/waybar/style/[Extra] EverForest.css index b7d6e753..817b78ac 100644 --- a/config/waybar/style/[Extra] EverForest.css +++ b/config/waybar/style/[Extra] EverForest.css @@ -309,16 +309,23 @@ window#waybar.empty #window { #wireplumber, #workspaces, #custom-backlight, +#custom-browser, +#custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Extra] Mauve.css b/config/waybar/style/[Extra] Mauve.css index e3c1fa9f..72f5374c 100644 --- a/config/waybar/style/[Extra] Mauve.css +++ b/config/waybar/style/[Extra] Mauve.css @@ -143,17 +143,23 @@ tooltip { #wireplumber, #workspaces, #custom-backlight, +#custom-browser, #custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Extra] Rose Pine.css b/config/waybar/style/[Extra] Rose Pine.css index 1266f0f6..77c4f583 100644 --- a/config/waybar/style/[Extra] Rose Pine.css +++ b/config/waybar/style/[Extra] Rose Pine.css @@ -125,19 +125,24 @@ tooltip { #window, #wireplumber, #custom-backlight, +#custom-browser, +#custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, -#custom-swaync, -#custom-cava_mviz, #custom-weather, #custom-weather.clearNight, #custom-weather.cloudyFoggyDay, diff --git a/config/waybar/style/[Extra] Simple Pink.css b/config/waybar/style/[Extra] Simple Pink.css index 64b44378..c2f522b0 100644 --- a/config/waybar/style/[Extra] Simple Pink.css +++ b/config/waybar/style/[Extra] Simple Pink.css @@ -136,17 +136,23 @@ tooltip { #wireplumber, #workspaces, #custom-backlight, +#custom-browser, #custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Light] Monochrome Contrast.css b/config/waybar/style/[Light] Monochrome Contrast.css index 0567a54e..cd2eb0ea 100644 --- a/config/waybar/style/[Light] Monochrome Contrast.css +++ b/config/waybar/style/[Light] Monochrome Contrast.css @@ -128,16 +128,23 @@ tooltip label{ #wireplumber, #workspaces, #custom-backlight, +#custom-browser, +#custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Light] Obsidian Glow.css b/config/waybar/style/[Light] Obsidian Glow.css index efa2d04e..f860ce50 100644 --- a/config/waybar/style/[Light] Obsidian Glow.css +++ b/config/waybar/style/[Light] Obsidian Glow.css @@ -101,17 +101,23 @@ tooltip label { #wireplumber, #workspaces, #custom-backlight, +#custom-browser, #custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Retro] Simple Style.css b/config/waybar/style/[Retro] Simple Style.css index cbb96770..27e9db98 100644 --- a/config/waybar/style/[Retro] Simple Style.css +++ b/config/waybar/style/[Retro] Simple Style.css @@ -68,16 +68,23 @@ window#waybar { #wireplumber, #workspaces, #custom-backlight, +#custom-browser, +#custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Transparent] Crystal Clear.css b/config/waybar/style/[Transparent] Crystal Clear.css index 580105b5..3d52a7fd 100644 --- a/config/waybar/style/[Transparent] Crystal Clear.css +++ b/config/waybar/style/[Transparent] Crystal Clear.css @@ -89,17 +89,24 @@ window#waybar.empty #window { #window, #wireplumber, #workspaces, +#custom-backlight, +#custom-browser, +#custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, -#custom-swaync, +#custom-settings, #custom-spotify, +#custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css b/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css index b5de0776..8885aa97 100644 --- a/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css +++ b/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css @@ -78,16 +78,23 @@ tooltip { #window, #wireplumber, #custom-backlight, +#custom-browser, +#custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Wallust Bordered] Chroma Simple.css b/config/waybar/style/[Wallust Bordered] Chroma Simple.css index f34ff26b..0196f85f 100644 --- a/config/waybar/style/[Wallust Bordered] Chroma Simple.css +++ b/config/waybar/style/[Wallust Bordered] Chroma Simple.css @@ -102,17 +102,23 @@ tooltip { #window, #wireplumber, #custom-backlight, +#custom-browser, #custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Wallust Transparent] Crystal Clear.css b/config/waybar/style/[Wallust Transparent] Crystal Clear.css index 3e60ee2d..3bd05a49 100644 --- a/config/waybar/style/[Wallust Transparent] Crystal Clear.css +++ b/config/waybar/style/[Wallust Transparent] Crystal Clear.css @@ -113,17 +113,24 @@ window#waybar.empty #window { #window, #wireplumber, #workspaces, +#custom-backlight, +#custom-browser, +#custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, -#custom-swaync, +#custom-settings, #custom-spotify, +#custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Wallust] Box type.css b/config/waybar/style/[Wallust] Box type.css index 0473a533..496c3c77 100644 --- a/config/waybar/style/[Wallust] Box type.css +++ b/config/waybar/style/[Wallust] Box type.css @@ -103,16 +103,23 @@ window#waybar.empty #window { #wireplumber, #workspaces, #custom-backlight, +#custom-browser, +#custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Wallust] Chroma Edge.css b/config/waybar/style/[Wallust] Chroma Edge.css index 162baf8f..b58e607d 100644 --- a/config/waybar/style/[Wallust] Chroma Edge.css +++ b/config/waybar/style/[Wallust] Chroma Edge.css @@ -105,16 +105,23 @@ tooltip label{ #wireplumber, #workspaces, #custom-backlight, +#custom-browser, +#custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Wallust] Chroma Fusion.css b/config/waybar/style/[Wallust] Chroma Fusion.css index d56d90ae..78501aa2 100644 --- a/config/waybar/style/[Wallust] Chroma Fusion.css +++ b/config/waybar/style/[Wallust] Chroma Fusion.css @@ -78,16 +78,24 @@ tooltip { #window, #wireplumber, #workspaces, +#custom-backlight, +#custom-browser, +#custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Wallust] Chroma Tally.css b/config/waybar/style/[Wallust] Chroma Tally.css index 5b4ad430..dede0609 100644 --- a/config/waybar/style/[Wallust] Chroma Tally.css +++ b/config/waybar/style/[Wallust] Chroma Tally.css @@ -97,16 +97,23 @@ tooltip { #wireplumber, #workspaces, #custom-backlight, +#custom-browser, +#custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Wallust] Colored.css b/config/waybar/style/[Wallust] Colored.css index 9fb2465b..be6bae2a 100644 --- a/config/waybar/style/[Wallust] Colored.css +++ b/config/waybar/style/[Wallust] Colored.css @@ -128,17 +128,23 @@ tooltip { #wireplumber, #workspaces, #custom-backlight, +#custom-browser, #custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, diff --git a/config/waybar/style/[Wallust] Simple.css b/config/waybar/style/[Wallust] Simple.css index ace97257..510658d3 100644 --- a/config/waybar/style/[Wallust] Simple.css +++ b/config/waybar/style/[Wallust] Simple.css @@ -126,17 +126,23 @@ tooltip { #wireplumber, #workspaces, #custom-backlight, +#custom-browser, #custom-cava_mviz, #custom-cycle_wall, -#custom-hint, -#custom-hypridle, +#custom-file_manager, +#custom-keybinds, #custom-keyboard, #custom-light_dark, #custom-lock, +#custom-hint, +#custom-hypridle, #custom-menu, #custom-power_vertical, #custom-power, +#custom-settings, +#custom-spotify, #custom-swaync, +#custom-tty, #custom-updater, #custom-weather, #custom-weather.clearNight, @@ -1,12 +1,12 @@ #!/bin/bash -### https://github.com/JaKooLit/JaKooLit +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # clear wallpaper=$HOME/.config/hypr/wallpaper_effects/.wallpaper_modified waybar_style="$HOME/.config/waybar/style/[Dark] Latte-Wallust combined.css" -waybar_config="$HOME/.config/waybar/configs/[TOP] Default_v3" -waybar_config_laptop="$HOME/.config/waybar/configs/[TOP] Default Laptop_v3" +waybar_config="$HOME/.config/waybar/configs/[TOP] Default_v4" +waybar_config_laptop="$HOME/.config/waybar/configs/[TOP] Default Laptop_v4" # Check if running as root. If root, script will exit if [[ $EUID -eq 0 ]]; then @@ -122,7 +122,7 @@ If you are not sure, just type us NOTE: • You can also set more than 2 keyboard layouts -• For example us,kr,gb,ru +• For example us, kr, gb, ru " printf "\n%.0s" {1..1} read -p "${CAT} - Please enter the correct keyboard layout: " new_layout @@ -140,7 +140,7 @@ printf "${NOTE} Detecting keyboard layout to prepare proper Hyprland Settings\n\ # Prompt the user to confirm whether the detected layout is correct while true; do - read -p "$ORANGE Current keyboard layout is: $layout. Is this correct? [y/n] " confirm + read -p "$ORANGE Current keyboard layout is: $layout ${CAT} Is this correct? [y/n] " confirm case $confirm in [yY]) @@ -170,7 +170,7 @@ If you are not sure, just type us NOTE: • You can also set more than 2 keyboard layouts -• For example us,kr,gb,ru +• For example us, kr, gb, ru " printf "\n%.0s" {1..1} @@ -218,7 +218,7 @@ while true; do done # Use the selected resolution in your existing script -echo "You chose $resolution resolution." 2>&1 | tee -a "$LOG" +echo "${OK} You have chosen $resolution resolution." 2>&1 | tee -a "$LOG" # Add your commands based on the resolution choice if [ "$resolution" == "≤ 1080p" ]; then @@ -244,34 +244,35 @@ while true; do # Convert the answer to lowercase for comparison answer=$(echo "$answer" | tr '[:upper:]' '[:lower:]') - # Check if the answer is valid - if [[ "$answer" == "y" ]]; then +# Check if the answer is valid +if [[ "$answer" == "y" ]]; then # Modify waybar config if 12hr is selected # Clock 1 - sed -i 's#^ \/\/"format": " {:%I:%M %p}", // AM PM format# "format": " {:%I:%M %p}", // AM PM format#' config/waybar/Modules 2>&1 | tee -a "$LOG" - sed -i 's#^ "format": " {:%H:%M:%S}", // 24H# \/\/"format": " {:%H:%M:%S}", // 24H#' config/waybar/Modules 2>&1 | tee -a "$LOG" + sed -i 's#^\(\s*\)//"format": " {:%I:%M %p}", // AM PM format#\1"format": " {:%I:%M %p}", // AM PM format#' config/waybar/Modules 2>&1 | tee -a "$LOG" + sed -i 's#^\(\s*\) "format": " {:%H:%M:%S}", // 24H#\1// "format": " {:%H:%M:%S}", // 24H#' config/waybar/Modules 2>&1 | tee -a "$LOG" # Clock 2 - sed -i 's#^ "format": " {:%H:%M}", // 24H# \/\/"format": " {:%H:%M}", // 24H#' config/waybar/Modules 2>&1 | tee -a "$LOG" + sed -i 's#^\(\s*\) "format": " {:%H:%M}", // 24H#\1// "format": " {:%H:%M}", // 24H#' config/waybar/Modules 2>&1 | tee -a "$LOG" # Clock 3 - sed -i 's#^ \/\/"format": "{:%I:%M %p - %d/%b}", //for AM/PM# "format": "{:%I:%M %p - %d/%b}", //for AM/PM#' config/waybar/Modules 2>&1 | tee -a "$LOG" - sed -i 's#^ "format": "{:%H:%M - %d/%b}", // 24H# \/\/"format": "{:%H:%M - %d/%b}", // 24H#' config/waybar/Modules 2>&1 | tee -a "$LOG" + sed -i 's#^\(\s*\)//"format": "{:%I:%M %p - %d/%b}", //for AM/PM#\1"format": "{:%I:%M %p - %d/%b}", //for AM/PM#' config/waybar/Modules 2>&1 | tee -a "$LOG" + sed -i 's#^\(\s*\) "format": "{:%H:%M - %d/%b}", // 24H#\1// "format": "{:%H:%M - %d/%b}", // 24H#' config/waybar/Modules 2>&1 | tee -a "$LOG" # Clock 4 - sed -i 's#^ \/\/"format": "{:%B | %a %d, %Y | %I:%M %p}", // AM PM format# "format": "{:%B | %a %d, %Y | %I:%M %p}", // AM PM format#' config/waybar/Modules 2>&1 | tee -a "$LOG" - sed -i 's#^ "format": "{:%B | %a %d, %Y | %H:%M}", // 24H# \/\/"format": "{:%B | %a %d, %Y | %H:%M}", // 24H#' config/waybar/Modules 2>&1 | tee -a "$LOG" + sed -i 's#^\(\s*\)//"format": "{:%B | %a %d, %Y | %I:%M %p}", // AM PM format#\1"format": "{:%B | %a %d, %Y | %I:%M %p}", // AM PM format#' config/waybar/Modules 2>&1 | tee -a "$LOG" + sed -i 's#^\(\s*\) "format": "{:%B | %a %d, %Y | %H:%M}", // 24H#\1// "format": "{:%B | %a %d, %Y | %H:%M}", // 24H#' config/waybar/Modules 2>&1 | tee -a "$LOG" # Clock 5 - sed -i 's#^ \/\/"format": "{:%A, %I:%M %P}", // AM PM format# "format": "{:%A, %I:%M %P}", // AM PM format#' config/waybar/Modules 2>&1 | tee -a "$LOG" - sed -i 's#^ "format": "{:%a %d | %H:%M}", // 24H# \/\/"format": "{:%a %d | %H:%M}", // 24H#' config/waybar/Modules 2>&1 | tee -a "$LOG" + sed -i 's#^\(\s*\)//"format": "{:%A, %I:%M %P}", // AM PM format#\1"format": "{:%A, %I:%M %P}", // AM PM format#' config/waybar/Modules 2>&1 | tee -a "$LOG" + sed -i 's#^\(\s*\) "format": "{:%a %d | %H:%M}", // 24H#\1// "format": "{:%a %d | %H:%M}", // 24H#' config/waybar/Modules 2>&1 | tee -a "$LOG" # for hyprlock - sed -i 's/^ text = cmd\[update:1000\] echo "\$(date +"%H")"/# &/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" - sed -i 's/^# *text = cmd\[update:1000\] echo "\$(date +"%I")" #AM\/PM/ text = cmd\[update:1000\] echo "\$(date +"%I")" #AM\/PM/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" + sed -i 's/^\s*text = cmd\[update:1000\] echo "\$(date +"%H")"/# &/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" + sed -i 's/^\(\s*\)# *text = cmd\[update:1000\] echo "\$(date +"%I")" #AM\/PM/\1 text = cmd\[update:1000\] echo "\$(date +"%I")" #AM\/PM/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" + + sed -i 's/^\s*text = cmd\[update:1000\] echo "\$(date +"%S")"/# &/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" + sed -i 's/^\(\s*\)# *text = cmd\[update:1000\] echo "\$(date +"%S %p")" #AM\/PM/\1 text = cmd\[update:1000\] echo "\$(date +"%S %p")" #AM\/PM/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" - sed -i 's/^ text = cmd\[update:1000\] echo "\$(date +"%S")"/# &/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" - sed -i 's/^# *text = cmd\[update:1000\] echo "\$(date +"%S %p")" #AM\/PM/ text = cmd\[update:1000\] echo "\$(date +"%S %p")" #AM\/PM/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" # for SDDM (simple-sddm) sddm_folder="/usr/share/sddm/themes/simple-sddm" @@ -281,7 +282,7 @@ while true; do sudo sed -i 's|^## HourFormat="hh:mm AP"|HourFormat="hh:mm AP"|' "$sddm_folder/theme.conf" 2>&1 | tee -a "$LOG" || true sudo sed -i 's|^HourFormat="HH:mm"|## HourFormat="HH:mm"|' "$sddm_folder/theme.conf" 2>&1 | tee -a "$LOG" || true - echo "12H format set to SDDM theme successfully." 2>&1 | tee -a "$LOG" + echo "${OK} 12H format set to SDDM theme successfully." 2>&1 | tee -a "$LOG" fi # for SDDM (simple-sddm-2) @@ -297,7 +298,7 @@ while true; do break elif [[ "$answer" == "n" ]]; then - echo "You chose not to change to 12H format." 2>&1 | tee -a "$LOG" + echo "${NOTE} You chose not to change to 12H format." 2>&1 | tee -a "$LOG" break else echo "${ERROR} Invalid choice. Please enter y for yes or n for no." @@ -313,7 +314,7 @@ printf "${NOTE} - By default, Rainbow Borders animation is enabled.\n" printf "${NOTE} - However, this uses a bit more CPU and Memory resources.\n" # Prompt user to disable Rainbow Borders -read -p "Do you want to disable Rainbow Borders animation? (Y/N): " choice +read -p "${CAT} Do you want to disable Rainbow Borders animation? (Y/N): " choice if [[ "$choice" =~ ^[Yy]$ ]]; then # Move RainbowBorders.sh script to backup location mv config/hypr/UserScripts/RainbowBorders.sh config/hypr/UserScripts/RainbowBorders.bak.sh @@ -324,9 +325,9 @@ if [[ "$choice" =~ ^[Yy]$ ]]; then # Comment out the line animation = borderangle, 1, 180, liner, loop sed -i '/ animation = borderangle, 1, 180, liner, loop/s/^/#/' config/hypr/UserConfigs/UserDecorAnimations.conf - echo "Rainbow borders is now disabled." 2>&1 | tee -a "$LOG" + echo "${OK} Rainbow borders is now disabled." 2>&1 | tee -a "$LOG" else - echo "No changes made. Rainbow borders remain enabled." 2>&1 | tee -a "$LOG" + echo "${NOTE} No changes made. Rainbow borders remain enabled." 2>&1 | tee -a "$LOG" fi printf "\n" @@ -473,19 +474,21 @@ printf "\n" if hostnamectl | grep -q 'Chassis: desktop'; then # Configurations for a desktop ln -sf "$waybar_config" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" - # Remove old configurations for desktop + # Remove waybar configs for laptop rm -rf "$HOME/.config/waybar/configs/[TOP] Default Laptop" \ "$HOME/.config/waybar/configs/[BOT] Default Laptop" \ "$HOME/.config/waybar/configs/[TOP] Default Laptop_v2" \ - "$HOME/.config/waybar/configs/[TOP] Default Laptop_v3" 2>&1 | tee -a "$LOG" || true + "$HOME/.config/waybar/configs/[TOP] Default Laptop_v3" \ + "$HOME/.config/waybar/configs/[TOP] Default Laptop_v4" 2>&1 | tee -a "$LOG" || true else # Configurations for a laptop or any system other than desktop ln -sf "$waybar_config_laptop" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" - # Remove old configurations for laptop + # Remove waybar configs for desktop rm -rf "$HOME/.config/waybar/configs/[TOP] Default" \ "$HOME/.config/waybar/configs/[BOT] Default" \ "$HOME/.config/waybar/configs/[TOP] Default_v2" \ - "$HOME/.config/waybar/configs/[TOP] Default_v3" 2>&1 | tee -a "$LOG" || true + "$HOME/.config/waybar/configs/[TOP] Default_v3" \ + "$HOME/.config/waybar/configs/[TOP] Default_v4" 2>&1 | tee -a "$LOG" || true fi # additional wallpapers @@ -493,7 +496,7 @@ echo "$(tput setaf 6) By default only a few wallpapers are copied...$(tput sgr0) printf "\n" while true; do - read -rp "${CAT} Would you like to download additional wallpapers? ${WARN} This is more than >600mb (y/n)" WALL + read -rp "${CAT} Would you like to download additional wallpapers? ${WARN} This is more than >700mb (y/n)" WALL case $WALL in [Yy]) echo "${NOTE} Downloading additional wallpapers..." @@ -1,10 +1,12 @@ #!/bin/bash +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # +# For downloading dots from releases # Set some colors for output messages OK="$(tput setaf 2)[OK]$(tput sgr0)" ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)" NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)" -WARN="$(tput setaf 166)[WARN]$(tput sgr0)" +WARN="$(tput setaf 5)[WARN]$(tput sgr0)" CAT="$(tput setaf 6)[ACTION]$(tput sgr0)" ORANGE=$(tput setaf 166) YELLOW=$(tput setaf 3) @@ -1,11 +1,14 @@ #!/bin/bash -### https://github.com/JaKooLit/JaKooLit +# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # +# for Semi-Manual upgrading your system. +# NOTE: requires rsync + # Set some colors for output messages OK="$(tput setaf 2)[OK]$(tput sgr0)" ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)" NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)" -WARN="$(tput setaf 166)[WARN]$(tput sgr0)" +WARN="$(tput setaf 5)[WARN]$(tput sgr0)" CAT="$(tput setaf 6)[ACTION]$(tput sgr0)" ORANGE=$(tput setaf 166) YELLOW=$(tput setaf 3) @@ -17,7 +20,7 @@ if [ ! -d Upgrade-Logs ]; then mkdir Upgrade-Logs fi -LOG="Upgrade-Logs/upgrade-$(date +%d-%H%M%S)_dotfiles.log" +LOG="Upgrade-Logs/upgrade-$(date +%d-%H%M%S)_upgrade_dotfiles.log" # source and target versions source_dir="config" |