diff --git a/install-scripts/01-hypr-pkgs.sh b/install-scripts/01-hypr-pkgs.sh index 03f44be..7064a3d 100755 --- a/install-scripts/01-hypr-pkgs.sh +++ b/install-scripts/01-hypr-pkgs.sh @@ -10,68 +10,68 @@ Extra=( ) -# packages neeeded -hypr_package=( - cliphist - grim - gvfs - gvfs-backends - inxi - imagemagick - kitty - nano - pavucontrol - playerctl - polkit-kde-agent-1 - pkexec - python3-requests - python3-pip - qt5ct - qt5-style-kvantum - qt5-style-kvantum-themes - qt6ct - slurp - sway-notification-center - swappy - unzip # required later - waybar - wget - wl-clipboard - wlogout - xdg-user-dirs - xdg-utils - yad +# packages needed +hypr_package=( + cliphist + grim + gvfs + gvfs-backends + inxi + imagemagick + kitty + nano + pavucontrol + playerctl + polkit-kde-agent-1 + python3-requests + python3-pip + qt5ct + qt5-style-kvantum + qt5-style-kvantum-themes + qt6ct + slurp + swappy + sway-notification-center + unzip + waybar + wget + wl-clipboard + wlogout + xdg-user-dirs + xdg-utils + yad ) # the following packages can be deleted. however, dotfiles may not work properly hypr_package_2=( - brightnessctl - btop - cava - loupe - nwg-look - nwg-displays - fastfetch - gnome-system-monitor - mousepad - mpv - mpv-mpris - nvtop - pamixer - qalculate-gtk + brightnessctl + btop + cava + fastfetch + loupe + gnome-system-monitor + mousepad + mpv + mpv-mpris + nwg-look + nwg-displays + nvtop + pamixer + qalculate-gtk +) + +# packages to force reinstall +force=( + imagemagick + wayland-protocols ) # List of packages to uninstall as it conflicts with swaync or causing swaync to not function properly uninstall=( - dunst - mako - rofi - cargo -) - -# List packages to force reinstall -force=( - yad + dunst + mako + rofi + cargo ) ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## @@ -106,7 +106,6 @@ fi printf "\n%.0s" {1..1} - # Installation of main components printf "\n%s - Installing ${SKY_BLUE}KooL's hyprland necessary packages${RESET} .... \n" "${NOTE}" @@ -114,12 +113,13 @@ for PKG1 in "${hypr_package[@]}" "${hypr_package_2[@]}" "${Extra[@]}"; do install_package "$PKG1" "$LOG" done +printf "\n%.0s" {1..1} + for PKG2 in "${force[@]}"; do re_install_package "$PKG2" "$LOG" done printf "\n%.0s" {1..1} - # install YAD from assets. NOTE This is downloaded from SID repo and sometimes # Trixie is removing YAD for some strange reasons # Check if yad is installed diff --git a/install-scripts/02-pre-cleanup.sh b/install-scripts/02-pre-cleanup.sh index 80f8015..9864ac3 100644 --- a/install-scripts/02-pre-cleanup.sh +++ b/install-scripts/02-pre-cleanup.sh @@ -3,7 +3,7 @@ # This script is cleaning up previous manual installation files / directories # 22 Aug 2024 -# Files to be removed rom /usr/local/bin +# Files to be removed from /usr/local/bin TARGET_DIR="/usr/local/bin" @@ -46,7 +46,9 @@ for PKG_NAME in "${PACKAGES[@]}"; do # Delete the file sudo rm "$FILE_PATH" echo "Deleted: $FILE_PATH" 2>&1 | tee -a "$LOG" + else + echo "File not found: $FILE_PATH" 2>&1 | tee -a "$LOG" fi done -printf "\n%.0s" {1..2} \ No newline at end of file +clear \ No newline at end of file diff --git a/install-scripts/ags.sh b/install-scripts/ags.sh index ab190e3..5eaadc2 100755 --- a/install-scripts/ags.sh +++ b/install-scripts/ags.sh @@ -49,6 +49,7 @@ if command -v ags &>/dev/null; then AGS_VERSION=$(ags -v | awk '{print $NF}') if [[ "$AGS_VERSION" == "1.9.0" ]]; then printf "${INFO} ${MAGENTA}Aylur's GTK Shell v1.9.0${RESET} is already installed. Skipping installation." + printf "\n%.0s" {1..2} exit 0 fi fi diff --git a/install-scripts/hyprland.sh b/install-scripts/hyprland.sh index 984096d..71282e6 100755 --- a/install-scripts/hyprland.sh +++ b/install-scripts/hyprland.sh @@ -3,10 +3,8 @@ # Main Hyprland Package # hypr=( - libhyprutils0 - libhyprlang-dev - hyprwayland-scanner hyprland-protocols + hyprwayland-scanner ) # forcing to reinstall. Had experience it says hyprland is already installed @@ -30,6 +28,7 @@ fi # Set the name of the log file to include the current date and time LOG="Install-Logs/install-$(date +%d-%H%M%S)_hyprland.log" + # Hyprland printf "${NOTE} Installing ${SKY_BLUE}Hyprland packages${RESET} .......\n" for HYPR in "${hypr[@]}"; do diff --git a/install-scripts/sddm.sh b/install-scripts/sddm.sh index edc8007..3e4fe37 100755 --- a/install-scripts/sddm.sh +++ b/install-scripts/sddm.sh @@ -8,6 +8,7 @@ sddm1=( ) sddm2=( + qt6-5compat-dev qml6-module-qt5compat-graphicaleffects qt6-declarative-dev qt6-svg-dev diff --git a/install-scripts/sddm_theme.sh b/install-scripts/sddm_theme.sh index c063515..23c41b5 100755 --- a/install-scripts/sddm_theme.sh +++ b/install-scripts/sddm_theme.sh @@ -110,8 +110,7 @@ if git clone --depth=1 "$source_theme" "$theme_name"; then echo "Failed to copy fonts." fi - # Update font cache and log the output - fc-cache -v -f 2>&1 | tee -a "$LOG" + fc-cache -fv 2>&1 | tee -a "$LOG" printf "\n%.0s" {1..1} diff --git a/install-scripts/thunar.sh b/install-scripts/thunar.sh index e9907ad..08e9ebc 100755 --- a/install-scripts/thunar.sh +++ b/install-scripts/thunar.sh @@ -46,4 +46,4 @@ for DIR1 in gtk-3.0 Thunar xfce4; do fi done -printf "\n%.0s" {1..2} +printf "\n%.0s" {1..2} \ No newline at end of file diff --git a/install-scripts/wallust.sh b/install-scripts/wallust.sh index f95bb85..c8affdf 100755 --- a/install-scripts/wallust.sh +++ b/install-scripts/wallust.sh @@ -5,7 +5,6 @@ wallust=( wallust ) - ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -61,4 +60,4 @@ else fi -printf "\n%.0s" {1..2} +printf "\n%.0s" {1..2} \ No newline at end of file diff --git a/install-scripts/zsh.sh b/install-scripts/zsh.sh index d0de942..36ce913 100755 --- a/install-scripts/zsh.sh +++ b/install-scripts/zsh.sh @@ -3,10 +3,10 @@ # Zsh and Oh my Zsh + Optional Pokemon ColorScripts# zsh=( - lsd - mercurial - zsh - zplug + lsd + zsh + mercurial + zplug ) ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## diff --git a/install-scripts/zsh_pokemon.sh b/install-scripts/zsh_pokemon.sh index 35c0863..d9f07fb 100755 --- a/install-scripts/zsh_pokemon.sh +++ b/install-scripts/zsh_pokemon.sh @@ -18,7 +18,6 @@ fi # Set the name of the log file to include the current date and time LOG="Install-Logs/install-$(date +%d-%H%M%S)_zsh_pokemon.log" - printf "${INFO} Installing ${SKY_BLUE}Pokemon color scripts${RESET} ..." if [ -d "pokemon-colorscripts" ]; then @@ -34,7 +33,6 @@ if [ -f "$HOME/.zshrc" ]; then sed -i "s|^fastfetch -c \$HOME/.config/fastfetch/config-compact.jsonc|#fastfetch -c \$HOME/.config/fastfetch/config-compact.jsonc|" "$HOME/.zshrc" >> "$LOG" 2>&1 else echo "$HOME/.zshrc not found. Cant enable ${YELLOW}Pokemon color scripts${RESET}" >> "$LOG" 2>&1 -fi - - +fi + printf "\n%.0s" {1..2} diff --git a/install.sh b/install.sh index 7fdeefd..7a94387 100755 --- a/install.sh +++ b/install.sh @@ -169,7 +169,7 @@ if check_services_running; then # Display the active login manager(s) in the whiptail message box whiptail --title "Active non-SDDM login manager(s) detected" \ - --msgbox "The following login manager(s) are active:\n\n$active_list\n\nIf you want to install SDDM and SDDM theme, stop and disable first the active services above first before running this script\nRefer to README on switching to SDDM if you really want SDDM\n\nNOTE: Your option to install SDDM and SDDM theme has now been removed\n\nšŸ˜Ž Ja " 27 80 + --msgbox "The following login manager(s) are active:\n\n$active_list\n\nIf you want to install SDDM and SDDM theme, stop and disable first the active services above first before running this script\nRefer to README on switching to SDDM if you really want SDDM\n\nNOTE: Your option to install SDDM and SDDM theme has now been removed\n\n-Ja " 27 80 fi # Check if NVIDIA GPU is detected