diff --git a/config/hypr/configs/ENVariables.conf b/config/hypr/configs/ENVariables.conf index 8a15424..4437c64 100644 --- a/config/hypr/configs/ENVariables.conf +++ b/config/hypr/configs/ENVariables.conf @@ -1,4 +1,4 @@ -## JaKooLit Github - https://github.com/JaKooLit +## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## #environment-variables env = CLUTTER_BACKEND,wayland diff --git a/config/hypr/configs/Execs.conf b/config/hypr/configs/Execs.conf index 2005eae..85870f7 100644 --- a/config/hypr/configs/Execs.conf +++ b/config/hypr/configs/Execs.conf @@ -1,3 +1,5 @@ +## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## + #Commands to be executed at launch $scriptsDir = $HOME/.config/hypr/scripts $lock = $scriptsDir/LockScreen.sh diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf index f264cd7..2c0b434 100644 --- a/config/hypr/configs/Keybinds.conf +++ b/config/hypr/configs/Keybinds.conf @@ -1,3 +1,5 @@ +## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## + # See https://wiki.hyprland.org/Configuring/Keywords/ for more # Setting variables # See laptops.conf diff --git a/config/hypr/configs/Laptops.conf b/config/hypr/configs/Laptops.conf index 58cdccd..ee67928 100644 --- a/config/hypr/configs/Laptops.conf +++ b/config/hypr/configs/Laptops.conf @@ -1,3 +1,5 @@ +## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## + # See https://wiki.hyprland.org/Configuring/Keywords/ for more # Setting variables # This configs are mostly for laptops. This is addemdum to Keybinds.conf diff --git a/config/hypr/configs/Monitors.conf b/config/hypr/configs/Monitors.conf index 6481942..ac87862 100644 --- a/config/hypr/configs/Monitors.conf +++ b/config/hypr/configs/Monitors.conf @@ -1,3 +1,5 @@ +## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## + # Monitor Configuration # See Hyprland wiki for more details # https://wiki.hyprland.org/Configuring/Monitors/ diff --git a/config/hypr/configs/Settings.conf b/config/hypr/configs/Settings.conf index a3c9768..f2705d9 100644 --- a/config/hypr/configs/Settings.conf +++ b/config/hypr/configs/Settings.conf @@ -1,5 +1,6 @@ +## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## + ## refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables -## JaKooLit Github - https://github.com/JaKooLit source = $HOME/.cache/wal/colors-hyprland diff --git a/config/hypr/configs/WindowRules.conf b/config/hypr/configs/WindowRules.conf index e6bea4f..f92f0ce 100644 --- a/config/hypr/configs/WindowRules.conf +++ b/config/hypr/configs/WindowRules.conf @@ -1,5 +1,6 @@ +## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more -## JaKooLit Github - https://github.com/JaKooLit + windowrule = float, org.kde.polkit-kde-authentication-agent-1 windowrule = float, nm-connection-editor|blueman-manager diff --git a/config/hypr/scripts/RofiBeats.sh b/config/hypr/scripts/RofiBeats.sh index 3a874f5..27fbf08 100755 --- a/config/hypr/scripts/RofiBeats.sh +++ b/config/hypr/scripts/RofiBeats.sh @@ -1,73 +1,44 @@ #!/bin/bash -## Files +# Directory for icons iDIR="$HOME/.config/dunst/icons" -notification(){ - dunstify -h string:x-canonical-private-synchronous:sys-notify -u normal -i "$iDIR/music.png" "Playing now: " "$@" -} +# Note: You can add more options below with the following format: +# ["TITLE"]="link" + +# Define menu options as an associative array +declare -A menu_options=( + ["Lofi Girl ☕️🎶"]="https://play.streamafrica.net/lofiradio" + ["96.3 Easy Rock 📻🎶"]="https://radio-stations-philippines.com/easy-rock" + ["Ghibli Music 🎻🎶"]="https://youtube.com/playlist?list=PLNi74S754EXbrzw-IzVhpeAaMISNrzfUy&si=rqnXCZU5xoFhxfOl" + ["Top Youtube Music 2023 ☕️🎶"]="https://youtube.com/playlist?list=PLDIoUOhQQPlXr63I_vwF9GD8sAKh77dWU&si=y7qNeEVFNgA-XxKy" + ["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" +) -menu(){ -printf "1. Lofi Girl\n" -printf "2. 96.3 Easy Rock - FM Radio\n" -printf "3. Ghibli Music (Instrumental)\n" -printf "4. Top Youtube Music 2023\n" -printf "5. Chillhop\n" -printf "6. SmoothChill\n" -printf "7. Relaxing Music\n" -printf "8. Youtube Remix\n" -printf "9. Korean Drama OST" +# Function for displaying notifications +notification() { + dunstify -h string:x-canonical-private-synchronous:sys-notify -u normal -i "$iDIR/music.png" "Playing now: $@" } + +# Main function main() { -choice=$(menu | rofi -dmenu -config ~/.config/rofi/config-rofi-Beats.rasi | cut -d. -f1) + choice=$(printf "%s\n" "${!menu_options[@]}" | rofi -dmenu -config ~/.config/rofi/config-rofi-Beats.rasi -i -p "") + + link="${menu_options[$choice]}" -case $choice in -1) - notification "Lofi Girl ☕️🎶"; - mpv "https://play.streamafrica.net/lofiradio" - return - ;; -2) - notification "96.3 Easy Rock 📻🎶"; - mpv "https://radio-stations-philippines.com/easy-rock" - return - ;; -3) - notification "Ghibli Music 🎻🎶"; - mpv --shuffle --vid=no "https://youtube.com/playlist?list=PLNi74S754EXbrzw-IzVhpeAaMISNrzfUy&si=rqnXCZU5xoFhxfOl" - return - ;; -4) - notification "Top Youtube Music 2023 ☕️🎶"; - mpv --shuffle --vid=no "https://youtube.com/playlist?list=PLDIoUOhQQPlXr63I_vwF9GD8sAKh77dWU&si=y7qNeEVFNgA-XxKy" - return - ;; -5) - notification "Chillhop ☕️🎶"; - mpv "http://stream.zeno.fm/fyn8eh3h5f8uv" - return - ;; -6) - notification "SmoothChill ☕️🎶"; - mpv "https://media-ssl.musicradio.com/SmoothChill" - return - ;; -7) - notification "Relaxing Music ☕️🎶"; - mpv --shuffle --vid=no "https://youtube.com/playlist?list=PLMIbmfP_9vb8BCxRoraJpoo4q1yMFg4CE" - return - ;; -8) - notification "Youtube Remix 📻🎶"; - mpv --shuffle --vid=no "https://youtube.com/playlist?list=PLeqTkIUlrZXlSNn3tcXAa-zbo95j0iN-0" - return - ;; -9) - notification "Korean Drama OST 📻🎶"; - mpv --shuffle --vid=no "https://youtube.com/playlist?list=PLUge_o9AIFp4HuA-A3e3ZqENh63LuRRlQ" - return - ;; -esac + notification "$choice" + + # Check if the link is a playlist + if [[ $link == *playlist* ]]; then + mpv --shuffle --vid=no "$link" + else + mpv "$link" + fi } -pkill -f http && notify-send -h string:x-canonical-private-synchronous:sys-notify -u low -i "$iDIR/music.png" "Online Music stopped" || main +# Check if an online music process is running and send a notification, otherwise run the main function +pkill -f http && dunstify -h string:x-canonical-private-synchronous:sys-notify -u low -i "$iDIR/music.png" "Online Music stopped" || main diff --git a/config/hypr/v2.1.18 b/config/hypr/v2.1.19 similarity index 100% rename from config/hypr/v2.1.18 rename to config/hypr/v2.1.19 diff --git a/config/rofi/config-long.rasi b/config/rofi/config-long.rasi index 28f6786..ca6edf1 100644 --- a/config/rofi/config-long.rasi +++ b/config/rofi/config-long.rasi @@ -24,7 +24,7 @@ configuration { /* ---- Window ---- */ window { - width: 900px; + width: 700px; /*height: 500px;*/ x-offset: 0px; y-offset: 0px; @@ -47,7 +47,7 @@ mainbox { enabled: true; orientation: vertical; padding: 8px; - background-image: url("~/.config/rofi/.current_wallpaper", width); + background-image: url("~/.config/rofi/.current_wallpaper", height); children: [ "imagebox" ]; border-radius: 12px; background-color: @background; diff --git a/config/rofi/config-waybar-layout.rasi b/config/rofi/config-waybar-layout.rasi index 65ab1f8..ff72895 100644 --- a/config/rofi/config-waybar-layout.rasi +++ b/config/rofi/config-waybar-layout.rasi @@ -48,7 +48,7 @@ mainbox { enabled: true; orientation: vertical; padding: 8px; - background-image: url("~/.config/rofi/.current_wallpaper", width); + background-image: url("~/.config/rofi/.current_wallpaper", height); children: [ "inputbar", "listbox"]; border-radius: 12px; } diff --git a/config/rofi/config-waybar-style.rasi b/config/rofi/config-waybar-style.rasi index 9fd9aa0..f0132ee 100644 --- a/config/rofi/config-waybar-style.rasi +++ b/config/rofi/config-waybar-style.rasi @@ -48,7 +48,7 @@ mainbox { enabled: true; orientation: vertical; padding: 8px; - background-image: url("~/.config/rofi/.current_wallpaper", width); + background-image: url("~/.config/rofi/.current_wallpaper", height); children: [ "inputbar", "listbox"]; border-radius: 12px; } diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi index cee7b92..5317fea 100644 --- a/config/rofi/config.rasi +++ b/config/rofi/config.rasi @@ -24,7 +24,7 @@ configuration { /* ---- Window ---- */ window { - width: 800px; + width: 700px; /*height: 450px;*/ x-offset: 0px; y-offset: 0px; @@ -47,7 +47,7 @@ mainbox { enabled: true; orientation: vertical; padding: 8px; - background-image: url("~/.config/rofi/.current_wallpaper", width); + background-image: url("~/.config/rofi/.current_wallpaper", height); children: [ "inputbar", "listbox" ]; border-radius: 12px; } diff --git a/config/rofi/resolution/1080p/config-long.rasi b/config/rofi/resolution/1080p/config-long.rasi index 28f6786..ca6edf1 100644 --- a/config/rofi/resolution/1080p/config-long.rasi +++ b/config/rofi/resolution/1080p/config-long.rasi @@ -24,7 +24,7 @@ configuration { /* ---- Window ---- */ window { - width: 900px; + width: 700px; /*height: 500px;*/ x-offset: 0px; y-offset: 0px; @@ -47,7 +47,7 @@ mainbox { enabled: true; orientation: vertical; padding: 8px; - background-image: url("~/.config/rofi/.current_wallpaper", width); + background-image: url("~/.config/rofi/.current_wallpaper", height); children: [ "imagebox" ]; border-radius: 12px; background-color: @background; diff --git a/config/rofi/resolution/1080p/config-waybar-layout.rasi b/config/rofi/resolution/1080p/config-waybar-layout.rasi index 65ab1f8..ff72895 100644 --- a/config/rofi/resolution/1080p/config-waybar-layout.rasi +++ b/config/rofi/resolution/1080p/config-waybar-layout.rasi @@ -48,7 +48,7 @@ mainbox { enabled: true; orientation: vertical; padding: 8px; - background-image: url("~/.config/rofi/.current_wallpaper", width); + background-image: url("~/.config/rofi/.current_wallpaper", height); children: [ "inputbar", "listbox"]; border-radius: 12px; } diff --git a/config/rofi/resolution/1080p/config-waybar-style.rasi b/config/rofi/resolution/1080p/config-waybar-style.rasi index 9fd9aa0..f0132ee 100644 --- a/config/rofi/resolution/1080p/config-waybar-style.rasi +++ b/config/rofi/resolution/1080p/config-waybar-style.rasi @@ -48,7 +48,7 @@ mainbox { enabled: true; orientation: vertical; padding: 8px; - background-image: url("~/.config/rofi/.current_wallpaper", width); + background-image: url("~/.config/rofi/.current_wallpaper", height); children: [ "inputbar", "listbox"]; border-radius: 12px; } diff --git a/config/rofi/resolution/1080p/config.rasi b/config/rofi/resolution/1080p/config.rasi index cee7b92..5317fea 100644 --- a/config/rofi/resolution/1080p/config.rasi +++ b/config/rofi/resolution/1080p/config.rasi @@ -24,7 +24,7 @@ configuration { /* ---- Window ---- */ window { - width: 800px; + width: 700px; /*height: 450px;*/ x-offset: 0px; y-offset: 0px; @@ -47,7 +47,7 @@ mainbox { enabled: true; orientation: vertical; padding: 8px; - background-image: url("~/.config/rofi/.current_wallpaper", width); + background-image: url("~/.config/rofi/.current_wallpaper", height); children: [ "inputbar", "listbox" ]; border-radius: 12px; } diff --git a/config/rofi/resolution/1440p/config-long.rasi b/config/rofi/resolution/1440p/config-long.rasi index 5453ceb..d4c55ac 100644 --- a/config/rofi/resolution/1440p/config-long.rasi +++ b/config/rofi/resolution/1440p/config-long.rasi @@ -24,7 +24,7 @@ configuration { /* ---- Window ---- */ window { - width: 900px; + width: 700px; /*height: 500px;*/ x-offset: 0px; y-offset: 0px; @@ -47,7 +47,7 @@ mainbox { enabled: true; orientation: vertical; padding: 8px; - background-image: url("~/.config/rofi/.current_wallpaper", width); + background-image: url("~/.config/rofi/.current_wallpaper", height); children: [ "imagebox" ]; border-radius: 12px; background-color: @background; diff --git a/config/rofi/resolution/1440p/config-waybar-layout.rasi b/config/rofi/resolution/1440p/config-waybar-layout.rasi index 8c51c0c..b448456 100644 --- a/config/rofi/resolution/1440p/config-waybar-layout.rasi +++ b/config/rofi/resolution/1440p/config-waybar-layout.rasi @@ -48,7 +48,7 @@ mainbox { enabled: true; orientation: vertical; padding: 8px; - background-image: url("~/.config/rofi/.current_wallpaper", width); + background-image: url("~/.config/rofi/.current_wallpaper", height); children: [ "inputbar", "listbox"]; border-radius: 12px; } diff --git a/config/rofi/resolution/1440p/config-waybar-style.rasi b/config/rofi/resolution/1440p/config-waybar-style.rasi index cd73cfe..6700c1d 100644 --- a/config/rofi/resolution/1440p/config-waybar-style.rasi +++ b/config/rofi/resolution/1440p/config-waybar-style.rasi @@ -48,7 +48,7 @@ mainbox { enabled: true; orientation: vertical; padding: 8px; - background-image: url("~/.config/rofi/.current_wallpaper", width); + background-image: url("~/.config/rofi/.current_wallpaper", height); children: [ "inputbar", "listbox"]; border-radius: 12px; } diff --git a/config/rofi/resolution/1440p/config.rasi b/config/rofi/resolution/1440p/config.rasi index f486a42..d092d23 100644 --- a/config/rofi/resolution/1440p/config.rasi +++ b/config/rofi/resolution/1440p/config.rasi @@ -24,7 +24,7 @@ configuration { /* ---- Window ---- */ window { - width: 800px; + width: 700px; /*height: 450px;*/ x-offset: 0px; y-offset: 0px; @@ -47,7 +47,7 @@ mainbox { enabled: true; orientation: vertical; padding: 8px; - background-image: url("~/.config/rofi/.current_wallpaper", width); + background-image: url("~/.config/rofi/.current_wallpaper", height); children: [ "inputbar", "listbox" ]; border-radius: 12px; } diff --git a/copy.sh b/copy.sh index abd4efb..f607209 100755 --- a/copy.sh +++ b/copy.sh @@ -138,6 +138,8 @@ elif [ "$resolution" == "≥ 1440p" ]; then cp -r config/rofi/resolution/1440p/* config/rofi/ fi +printf "\n%.0s" {1..2} + ### Copy Config Files ### set -e # Exit immediately if a command exits with a non-zero status. @@ -168,18 +170,14 @@ cp -r config/* ~/.config/ && { echo "${OK}Copy completed!"; } || { echo "${ERROR # copying Wallpapers mkdir -p ~/Pictures/wallpapers cp -r wallpapers ~/Pictures/ && { echo "${OK}Copy completed!"; } || { echo "${ERROR} Failed to copy wallpapers."; exit 1; } 2>&1 | tee -a "$LOG" - - - - + # Set some files as executable chmod +x ~/.config/hypr/scripts/* 2>&1 | tee -a "$LOG" # Set executable for initial-boot.sh chmod +x ~/.config/hypr/initial-boot.sh 2>&1 | tee -a "$LOG" - -#printf "\n\n" +printf "\n%.0s" {1..3} # Additional wallpaper echo "$(tput setaf 6) By default only a few wallpapers are copied...$(tput sgr0)" read -n1 -rep "${CAT} Would you like to download additional wallpapers? (y/n)" WALL @@ -195,8 +193,6 @@ if [[ $WALL =~ ^[Yy]$ ]]; then fi fi -# Initial Symlinks to avoid errors - # Detect machine type and set Waybar configurations accordingly, logging the output if hostnamectl | grep -q 'Chassis: desktop'; then # Configurations for a desktop @@ -218,7 +214,7 @@ wal -i ~/Pictures/wallpapers/anime-girl-abyss.png 2>&1 | tee -a "$LOG" #initial symlink for Pywal Dark and Light for Rofi Themes ln -sf "$HOME/.cache/wal/colors-rofi-dark.rasi" "$HOME/.config/rofi/pywal-color/pywal-theme.rasi" -printf "\n\n" +printf "\n%.0s" {1..2} printf "\n${OK} Copy Completed!\n\n\n" printf "${ORANGE} ATTENTION!!!! \n" printf "${ORANGE} YOU NEED to logout and re-login or reboot to avoid issues\n\n"