diff options
| author | Ja.KooLit <85185940+JaKooLit@users.noreply.github.com> | 2024-07-07 06:34:41 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-07 06:34:41 +0900 |
| commit | 1d425834fe4c759ca0c2361dd24cd807b518c216 (patch) | |
| tree | 38d448de0737c496c215440d89cc7c574e41d470 | |
| parent | ce9b8df597095e68c3d5878a931a0f7619f8eaf5 (diff) | |
| parent | e9babc040992e94195d3a6f48b7eaa25e425c505 (diff) | |
Merge pull request #366 from JaKooLit/main
main to ags-dev
22 files changed, 238 insertions, 147 deletions
diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf index fe5e92f0..47f88ed5 100644 --- a/config/hypr/UserConfigs/UserSettings.conf +++ b/config/hypr/UserConfigs/UserSettings.conf @@ -18,9 +18,8 @@ dwindle { } master { - #new_is_master=1 # comment this when Hyprland release a new version or you are running the git version - new_status=master # hyprland upstream or git version (next release maybe v0.41-2 or v0.42) - new_on_top=1 + new_status = master #from Hyprland >v0.41.2 + new_on_top = 1 mfact = 0.5 } @@ -33,7 +32,7 @@ general { resize_on_border = true - col.active_border = $color0 $color2 $color9 $color12 $color15 90deg + col.active_border = $color12 col.inactive_border = $backgroundCol layout = dwindle diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf index 7e1a43a5..602531e1 100644 --- a/config/hypr/UserConfigs/WindowRules.conf +++ b/config/hypr/UserConfigs/WindowRules.conf @@ -68,6 +68,7 @@ windowrulev2 = float, class:^([Ff]erdium)$ windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$ windowrulev2 = opacity 0.9 0.7, class:^(Brave-browser(-beta|-dev)?)$ windowrulev2 = opacity 0.9 0.7, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$ +windowrulev2 = opacity 0.9 0.6, class:^([Tt]horium-browser)$ windowrulev2 = opacity 0.9 0.8, class:^([Mm]icrosoft-edge(-stable|-beta|-dev|-unstable)?)$ windowrulev2 = opacity 0.9 0.8, class:^(google-chrome(-beta|-dev|-unstable)?)$ windowrulev2 = opacity 0.94 0.86, class:^(chrome-.+-Default)$ # Chrome PWAs diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh index 7a7ac3f5..aa9f62e8 100755 --- a/config/hypr/UserScripts/RofiBeats.sh +++ b/config/hypr/UserScripts/RofiBeats.sh @@ -10,18 +10,18 @@ iDIR="$HOME/.config/swaync/icons" # Online Stations. Edit as required declare -A online_music=( - ["AfroBeatz 2024 🎧"]="https://www.youtube.com/watch?v=7uB-Eh9XVZQ" - ["Lofi Girl ☕️🎶"]="https://play.streamafrica.net/lofiradio" - ["Easy Rock 96.3 FM 📻🎶"]="https://radio-stations-philippines.com/easy-rock" - ["Wish 107.5 FM 📻🎶"]="https://radio-stations-philippines.com/dwnu-1075-wish" - ["Wish 107.5 YT Pinoy HipHop 🎻🎶"]="https://youtube.com/playlist?list=PLkrzfEDjeYJnmgMYwCKid4XIFqUKBVWEs&si=vahW_noh4UDJ5d37" - ["Top Youtube Music 2023 ☕️🎶"]="https://youtube.com/playlist?list=PLDIoUOhQQPlXr63I_vwF9GD8sAKh77dWU&si=y7qNeEVFNgA-XxKy" - ["Wish 107.5 YT Wishclusives ☕️🎶"]="https://youtube.com/playlist?list=PLkrzfEDjeYJn5B22H9HOWP3Kxxs-DkPSM&si=d_Ld2OKhGvpH48WO" - ["Chillhop ☕️🎶"]="http://stream.zeno.fm/fyn8eh3h5f8uv" - ["SmoothChill ☕️🎶"]="https://media-ssl.musicradio.com/SmoothChill" - ["Relaxing Music ☕️🎶"]="https://youtube.com/playlist?list=PLMIbmfP_9vb8BCxRoraJpoo4q1yMFg4CE" - ["Youtube Remix 📻🎶"]="https://youtube.com/playlist?list=PLeqTkIUlrZXlSNn3tcXAa-zbo95j0iN-0" - ["Korean Drama OST 📻🎶"]="https://youtube.com/playlist?list=PLUge_o9AIFp4HuA-A3e3ZqENh63LuRRlQ" + ["Lofi Girl Radio ☕️🎶"]="https://play.streamafrica.net/lofiradio" + ["FM - Easy Rock 96.3 📻🎶"]="https://radio-stations-philippines.com/easy-rock" + ["FM - WRock - CEBU 96.3 📻🎶"]="https://onlineradio.ph/126-96-3-wrock.html" + ["YT - Wish 107.5 YT Pinoy HipHop 🎻🎶"]="https://youtube.com/playlist?list=PLkrzfEDjeYJnmgMYwCKid4XIFqUKBVWEs&si=vahW_noh4UDJ5d37" + ["YT - Top Youtube Music 2023 ☕️🎶"]="https://youtube.com/playlist?list=PLDIoUOhQQPlXr63I_vwF9GD8sAKh77dWU&si=y7qNeEVFNgA-XxKy" + ["YT - Wish 107.5 YT Wishclusives ☕️🎶"]="https://youtube.com/playlist?list=PLkrzfEDjeYJn5B22H9HOWP3Kxxs-DkPSM&si=d_Ld2OKhGvpH48WO" + ["Chillhop Radio ☕️🎶"]="http://stream.zeno.fm/fyn8eh3h5f8uv" + ["FM - Fresh Philippines ☕️🎶"]="https://onlineradio.ph/553-fresh-fm.html" + ["YT - Relaxing Music ☕️🎶"]="https://youtube.com/playlist?list=PLMIbmfP_9vb8BCxRoraJpoo4q1yMFg4CE" + ["YT - Youtube Remix 📻🎶"]="https://youtube.com/playlist?list=PLeqTkIUlrZXlSNn3tcXAa-zbo95j0iN-0" + ["YT - Korean Drama OST 📻🎶"]="https://youtube.com/playlist?list=PLUge_o9AIFp4HuA-A3e3ZqENh63LuRRlQ" + ["YT - AfroBeatz 2024 🎧"]="https://www.youtube.com/watch?v=7uB-Eh9XVZQ" ) # Populate local_music array with files from music directory and subdirectories @@ -56,16 +56,9 @@ play_local_music() { notification "$choice" - # 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/$choice" - - else - file=$i - # Play the selected local music file using mpv - mpv --playlist-start="$file" --loop-playlist --vid=no "$mDIR/$choice" - fi + # Play the selected local music file using mpv + mpv --playlist-start="$i" --loop-playlist --vid=no "${local_music[@]}" + break fi done diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh index 06859112..d2ca7c28 100755 --- a/config/hypr/UserScripts/WallpaperSelect.sh +++ b/config/hypr/UserScripts/WallpaperSelect.sh @@ -33,8 +33,8 @@ rofi_command="rofi -i -show -dmenu -config ~/.config/rofi/config-wallpaper.rasi" # Sorting Wallpapers menu() { sorted_options=($(printf '%s\n' "${PICS[@]}" | sort)) - # Place ". random" at the beginning - printf "%s\n" "$RANDOM_PIC_NAME" + # Place ". random" at the beginning with the random picture as an icon + printf "%s\x00icon\x1f%s\n" "$RANDOM_PIC_NAME" "$RANDOM_PIC" for pic_path in "${sorted_options[@]}"; do pic_name=$(basename "$pic_path") # Displaying .gif to indicate animated images @@ -59,7 +59,6 @@ main() { # Random choice case if [ "$choice" = "$RANDOM_PIC_NAME" ]; then - RANDOM_PIC="${PICS[$((RANDOM % ${#PICS[@]}))]}" swww img -o $focused_monitor "${RANDOM_PIC}" $SWWW_PARAMS exit 0 fi diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf index e4362eab..42beb6b3 100644 --- a/config/hypr/hyprlock.conf +++ b/config/hypr/hyprlock.conf @@ -57,27 +57,40 @@ label { valign = top } -# Week +# Hour-Time label { monitor = - text = cmd[update:18000000] echo "<b> "$(date +'Week %U')" </b>" - color = $color5 - font_size = 24 + text = cmd[update:1000] echo -e "$(date +"%H")" +# text = cmd[update:1000] echo -e "$(date +"%I")" #AM/PM + color = rgba(255, 185, 0, .6) + font_size = 200 + font_family = JetBrains Mono Nerd Font Mono ExtraBold + position = 0, 140 + halign = center + valign = center +} + +# Minute-Tine +label { + monitor = + text = cmd[update:1000] echo -e "$(date +"%M")" + color = rgba(255, 255, 255, .6) + font_size = 200 font_family = JetBrains Mono Nerd Font Mono ExtraBold - position = 0, -250 + position = 0, -160 halign = center - valign = top + valign = center } -# Time +# Minute-Tine label { monitor = - #text = cmd[update:1000] echo "<b><big> $(date +"%I:%M:%S %p") </big></b>" # AM/PM - text = cmd[update:1000] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H - color = $color15 - font_size = 150 - font_family = AlfaSlabOne - position = 0, 0 + text = cmd[update:1000] echo -e "$(date +"%S")" +# text = cmd[update:1000] echo -e "$(date +"%S %p")" #AM/PM + color = $color12 + font_size = 40 + font_family = JetBrains Mono Nerd Font Mono ExtraBold + position = 0, 120 halign = center valign = center } diff --git a/config/hypr/scripts/Brightness.sh b/config/hypr/scripts/Brightness.sh index 8f9fbf22..d1f80932 100755 --- a/config/hypr/scripts/Brightness.sh +++ b/config/hypr/scripts/Brightness.sh @@ -4,15 +4,16 @@ iDIR="$HOME/.config/swaync/icons" notification_timeout=1000 +step=10 # INCREASE/DECREASE BY THIS VALUE # Get brightness get_backlight() { - echo $(brightnessctl -m | cut -d, -f4) + brightnessctl -m | cut -d, -f4 | sed 's/%//' } # Get icons get_icon() { - current=$(get_backlight | sed 's/%//') + current=$(get_backlight) if [ "$current" -le "20" ]; then icon="$iDIR/brightness-20.png" elif [ "$current" -le "40" ]; then @@ -33,7 +34,27 @@ notify_user() { # Change brightness change_backlight() { - brightnessctl set "$1" -n && get_icon && notify_user + local current_brightness + current_brightness=$(get_backlight) + + # Calculate new brightness + if [[ "$1" == "+${step}%" ]]; then + new_brightness=$((current_brightness + step)) + elif [[ "$1" == "${step}%-" ]]; then + new_brightness=$((current_brightness - step)) + fi + + # Ensure new brightness is within valid range + if (( new_brightness < 5 )); then + new_brightness=5 + elif (( new_brightness > 100 )); then + new_brightness=100 + fi + + brightnessctl set "${new_brightness}%" + get_icon + current=$new_brightness + notify_user } # Execute accordingly @@ -42,10 +63,10 @@ case "$1" in get_backlight ;; "--inc") - change_backlight "+10%" + change_backlight "+${step}%" ;; "--dec") - change_backlight "10%-" + change_backlight "${step}%-" ;; *) get_backlight diff --git a/config/hypr/scripts/GameMode.sh b/config/hypr/scripts/GameMode.sh index 5ad268ca..f8dc3505 100755 --- a/config/hypr/scripts/GameMode.sh +++ b/config/hypr/scripts/GameMode.sh @@ -20,7 +20,7 @@ if [ "$HYPRGAMEMODE" = 1 ] ; then notify-send -e -u low -i "$notif" "gamemode enabled. All animations off" exit else - swww-daemon && swww img "$HOME/.config/rofi/.current_wallpaper" & + swww-daemon --format xrgb && swww img "$HOME/.config/rofi/.current_wallpaper" & sleep 0.1 ${SCRIPTSDIR}/WallustSwww.sh sleep 0.5 diff --git a/config/hypr/v2.3 b/config/hypr/v2.3.1 index 31b3414d..31b3414d 100644 --- a/config/hypr/v2.3 +++ b/config/hypr/v2.3.1 diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index f8255096..60a20bdf 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -7,16 +7,19 @@ bold_italic_font auto background_opacity 0.5 confirm_os_window_close 0 +# change to x11 or wayland or leave auto +linux_display_server auto + scrollback_lines 2000 wheel_scroll_min_lines 1 enable_audio_bell no +window_padding_width 4 + selection_foreground none selection_background none -window_padding_width 4 - foreground #dddddd background #000000 cursor #dddddd
\ No newline at end of file diff --git a/config/wallust/templates/colors-kitty.conf b/config/wallust/templates/colors-kitty.conf index 92ceb48c..ab207635 100644 --- a/config/wallust/templates/colors-kitty.conf +++ b/config/wallust/templates/colors-kitty.conf @@ -7,6 +7,9 @@ bold_italic_font auto background_opacity 0.5 confirm_os_window_close 0 +# change to x11 or wayland or leave auto +linux_display_server auto + scrollback_lines 2000 wheel_scroll_min_lines 1 diff --git a/config/wlogout/icons/hibernate.png b/config/wlogout/icons/hibernate.png Binary files differindex 6a3d607f..0ff8b8eb 100644 --- a/config/wlogout/icons/hibernate.png +++ b/config/wlogout/icons/hibernate.png diff --git a/config/wlogout/icons/lock-hover.png b/config/wlogout/icons/lock-hover.png Binary files differindex 8fb86fe4..8fe9ee35 100644 --- a/config/wlogout/icons/lock-hover.png +++ b/config/wlogout/icons/lock-hover.png diff --git a/config/wlogout/icons/lock.png b/config/wlogout/icons/lock.png Binary files differindex 430451c8..08f0e986 100644..100755 --- a/config/wlogout/icons/lock.png +++ b/config/wlogout/icons/lock.png diff --git a/config/wlogout/icons/logout-hover.png b/config/wlogout/icons/logout-hover.png Binary files differindex 9e570a9e..e54c42af 100644 --- a/config/wlogout/icons/logout-hover.png +++ b/config/wlogout/icons/logout-hover.png diff --git a/config/wlogout/icons/logout.png b/config/wlogout/icons/logout.png Binary files differindex 128c9955..eee07d7b 100644..100755 --- a/config/wlogout/icons/logout.png +++ b/config/wlogout/icons/logout.png diff --git a/config/wlogout/icons/power-hover.png b/config/wlogout/icons/power-hover.png Binary files differindex 122d3318..5df24da7 100644 --- a/config/wlogout/icons/power-hover.png +++ b/config/wlogout/icons/power-hover.png diff --git a/config/wlogout/icons/power.png b/config/wlogout/icons/power.png Binary files differindex ce561661..190f2ee2 100644..100755 --- a/config/wlogout/icons/power.png +++ b/config/wlogout/icons/power.png diff --git a/config/wlogout/icons/restart-hover.png b/config/wlogout/icons/restart-hover.png Binary files differindex 3e185360..33aea144 100644 --- a/config/wlogout/icons/restart-hover.png +++ b/config/wlogout/icons/restart-hover.png diff --git a/config/wlogout/icons/restart.png b/config/wlogout/icons/restart.png Binary files differindex 7855d409..963c58e3 100644..100755 --- a/config/wlogout/icons/restart.png +++ b/config/wlogout/icons/restart.png diff --git a/config/wlogout/icons/sleep-hover.png b/config/wlogout/icons/sleep-hover.png Binary files differindex ef735a7c..0ac492d1 100644 --- a/config/wlogout/icons/sleep-hover.png +++ b/config/wlogout/icons/sleep-hover.png diff --git a/config/wlogout/icons/sleep.png b/config/wlogout/icons/sleep.png Binary files differindex f9480dd3..829316bb 100644..100755 --- a/config/wlogout/icons/sleep.png +++ b/config/wlogout/icons/sleep.png @@ -36,6 +36,11 @@ if [ ! -d Copy-Logs ]; then mkdir Copy-Logs fi +# Function to print colorful text +print_color() { + printf "%b%s%b\n" "$1" "$2" "$CLEAR" +} + # Set the name of the log file to include the current date and time LOG="Copy-Logs/install-$(date +%d-%H%M%S)_dotfiles.log" @@ -91,61 +96,88 @@ detect_layout() { layout=$(detect_layout) 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 + while true; do + printf "\n%.0s" {1..1} +print_color $RED " +█▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀█ + STOP AND READ +█▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█ + + !!! IMPORTANT WARNING !!! + +The Default Keyboard Layout could not be detected + +You need to set it Manually + +!!! WARNING !!! +Setting a wrong Keyboard Layout will cause Hyprland to crash + +If you are not sure, just type us + +NOTE: +• You can also set more than 2 keyboard layouts +• For example us,kr,gb,ru +" + 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 + 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 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 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 - echo "${NOTE} kb_layout $new_layout configured in settings." 2>&1 | tee -a "$LOG" - break ;; - *) - echo "Please enter either 'y' or 'n'." ;; - esac + 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} +print_color $RED " +█▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀█ + STOP AND READ +█▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█ + + !!! IMPORTANT WARNING !!! + +The Default Keyboard Layout could not be detected + +You need to set it Manually + +!!! WARNING !!! +Setting a wrong Keyboard Layout will cause Hyprland to crash + +If you are not sure, just type us + +NOTE: +• You can also set more than 2 keyboard layouts +• For example us,kr,gb,ru +" + 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 + echo "${NOTE} kb_layout $new_layout configured in settings." 2>&1 | tee -a "$LOG" + break ;; + *) + echo "Please enter either 'y' or 'n'." ;; + esac done printf "\n" @@ -186,8 +218,11 @@ while true; do sed -i 's#^ "format": "{:%a %d | %H:%M}", // 24H# \/\/"format": "{:%a %d | %H:%M}", // 24H#' config/waybar/modules 2>&1 | tee -a "$LOG" # for hyprlock - sed -i 's|^ #text = cmd\[update:1000\] echo "<b><big> $(date +"%I:%M:%S %p") </big></b>" # AM/PM| text = cmd\[update:1000\] echo "<b><big> $(date +"%I:%M:%S %p") </big></b>" # AM/PM|' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" - sed -i 's|^ text = cmd\[update:1000\] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H| #text = cmd\[update:1000\] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H|' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" + sed -i 's/^ text = cmd\[update:1000\] echo -e "\$(date +"%H")"/# &/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" + sed -i 's/^# *text = cmd\[update:1000\] echo -e "\$(date +"%I")" #AM\/PM/ text = cmd\[update:1000\] echo -e "\$(date +"%I")" #AM\/PM/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" + + sed -i 's/^ text = cmd\[update:1000\] echo -e "\$(date +"%S")"/# &/' config/hypr/hyprlock.conf 2>&1 | tee -a "$LOG" + sed -i 's/^# *text = cmd\[update:1000\] echo -e "\$(date +"%S %p")" #AM\/PM/ text = cmd\[update:1000\] echo -e "\$(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" @@ -224,24 +259,24 @@ printf "\n" # Action to do for better rofi appearance while true; do - echo "$ORANGE Select monitor resolution for better Rofi appearance:" - echo "$YELLOW 1. Equal to or less than 1080p (≤ 1080p)" - echo "$YELLOW 2. Equal to or higher than 1440p (≥ 1440p)" - read -p "$CAT Enter the number of your choice: " choice + echo "$ORANGE Select monitor resolution for better Rofi appearance:" + echo "$YELLOW 1. Equal to or less than 1080p (≤ 1080p)" + echo "$YELLOW 2. Equal to or higher than 1440p (≥ 1440p)" + read -p "$CAT Enter the number of your choice: " choice - case $choice in - 1) - resolution="≤ 1080p" - break - ;; - 2) - resolution="≥ 1440p" - break - ;; - *) - echo "Invalid choice. Please enter 1 for ≤ 1080p or 2 for ≥ 1440p." - ;; - esac + case $choice in + 1) + resolution="≤ 1080p" + break + ;; + 2) + resolution="≥ 1440p" + break + ;; + *) + echo "Invalid choice. Please enter 1 for ≤ 1080p or 2 for ≥ 1440p." + ;; + esac done # Use the selected resolution in your existing script @@ -256,7 +291,31 @@ fi printf "\n%.0s" {1..2} -### Copy Config Files ### +# Rainbow Borders +# Check if the user wants to disable Rainbow borders +# Print message about Rainbow Borders +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 +if [[ "$choice" =~ ^[Yy]$ ]]; then + # Move RainbowBorders.sh script to backup location + mv config/hypr/UserScripts/RainbowBorders.sh config/hypr/UserScripts/RainbowBorders.bak.sh + + # Comment out the line exec-once = $UserScripts/RainbowBorders.sh & + sed -i '/exec-once = \$UserScripts\/RainbowBorders.sh \&/s/^/#/' config/hypr/UserConfigs/Startup_Apps.conf + + # Comment out the line animation = borderangle, 1, 180, liner, loop + sed -i '/ animation = borderangle, 1, 180, liner, loop/s/^/#/' config/hypr/UserConfigs/UserSettings.conf + + echo "Rainbow borders is now disabled." 2>&1 | tee -a "$LOG" +else + echo "No changes made. Rainbow borders remain enabled." 2>&1 | tee -a "$LOG" +fi + + +# Copy Config Files # set -e # Exit immediately if a command exits with a non-zero status. printf "${NOTE} - copying dotfiles\n" @@ -312,38 +371,38 @@ echo "$(tput setaf 6) By default only a few wallpapers are copied...$(tput sgr0) printf "\n%.0s" {1..2} while true; do - read -rp "${CAT} Would you like to download additional wallpapers? Warning! This is more than >600mb (y/n)" WALL - case $WALL in - [Yy]) - echo "${NOTE} Downloading additional wallpapers..." - if git clone "https://github.com/JaKooLit/Wallpaper-Bank.git"; then - echo "${NOTE} Wallpapers downloaded successfully." 2>&1 | tee -a "$LOG" + read -rp "${CAT} Would you like to download additional wallpapers? Warning! This is more than >600mb (y/n)" WALL + case $WALL in + [Yy]) + echo "${NOTE} Downloading additional wallpapers..." + 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 + # 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 - break - else - echo "${ERROR} Copying wallpapers failed" 2>&1 | tee -a "$LOG" - fi - else - echo "${ERROR} Downloading additional wallpapers failed" 2>&1 | tee -a "$LOG" - fi - ;; - [Nn]) - echo "You chose not to download additional wallpapers." 2>&1 | tee -a "$LOG" - break - ;; - *) - echo "Please enter 'y' or 'n' to proceed." - ;; - esac + 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 + break + else + echo "${ERROR} Copying wallpapers failed" 2>&1 | tee -a "$LOG" + fi + else + echo "${ERROR} Downloading additional wallpapers failed" 2>&1 | tee -a "$LOG" + fi + ;; + [Nn]) + echo "You chose not to download additional wallpapers." 2>&1 | tee -a "$LOG" + break + ;; + *) + echo "Please enter 'y' or 'n' to proceed." + ;; + esac done # symlinks for waybar style |
